mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
c0936a71bd
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
69 lines
3.8 KiB
Diff
69 lines
3.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Professor Bloodstone <git@bloodstone.dev>
|
|
Date: Fri, 23 Jul 2021 02:32:04 +0200
|
|
Subject: [PATCH] Allow skipping writing of comments to server.properties
|
|
|
|
Makes less git noise, as it won't update the date every single time
|
|
|
|
Use -DPaper.skipServerPropertiesComments=true flag to disable writing it
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
|
|
index 9dde5b89e6de9d470b0c0b08e3aa6c471cd075fe..f6e423a76d4c9cf639f1d44af80d33cf3072f6b5 100644
|
|
--- a/src/main/java/net/minecraft/server/dedicated/Settings.java
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
|
|
@@ -29,6 +29,7 @@ public abstract class Settings<T extends Settings<T>> {
|
|
|
|
private static final Logger LOGGER = LogUtils.getLogger();
|
|
public final Properties properties;
|
|
+ private static final boolean skipComments = Boolean.getBoolean("Paper.skipServerPropertiesComments"); // Paper - allow skipping server.properties comments
|
|
// CraftBukkit start
|
|
private OptionSet options = null;
|
|
|
|
@@ -118,7 +119,46 @@ public abstract class Settings<T extends Settings<T>> {
|
|
return;
|
|
}
|
|
// CraftBukkit end
|
|
- BufferedWriter bufferedwriter = Files.newBufferedWriter(path, StandardCharsets.UTF_8);
|
|
+ // Paper start - disable writing comments to properties file
|
|
+ java.io.OutputStream outputstream = Files.newOutputStream(path);
|
|
+ java.io.BufferedOutputStream bufferedOutputStream = !skipComments ? new java.io.BufferedOutputStream(outputstream) : new java.io.BufferedOutputStream(outputstream) {
|
|
+ private boolean isRightAfterNewline = true; // If last written char was newline
|
|
+ private boolean isComment = false; // Are we writing comment currently?
|
|
+
|
|
+ @Override
|
|
+ public void write(@org.jetbrains.annotations.NotNull byte[] b) throws IOException {
|
|
+ this.write(b, 0, b.length);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void write(@org.jetbrains.annotations.NotNull byte[] bbuf, int off, int len) throws IOException {
|
|
+ int latest_offset = off; // The latest offset, updated when comment ends
|
|
+ for (int index = off; index < off + len; ++index ) {
|
|
+ byte c = bbuf[index];
|
|
+ boolean isNewline = (c == '\n' || c == '\r');
|
|
+ if (isNewline && this.isComment) {
|
|
+ // Comment has ended
|
|
+ this.isComment = false;
|
|
+ latest_offset = index+1;
|
|
+ }
|
|
+ if (c == '#' && this.isRightAfterNewline) {
|
|
+ this.isComment = true;
|
|
+ if (index != latest_offset) {
|
|
+ // We got some non-comment data earlier
|
|
+ super.write(bbuf, latest_offset, index-latest_offset);
|
|
+ }
|
|
+ }
|
|
+ this.isRightAfterNewline = isNewline; // Store for next iteration
|
|
+
|
|
+ }
|
|
+ if (latest_offset < off+len && !this.isComment) {
|
|
+ // We have some unwritten data, that isn't part of a comment
|
|
+ super.write(bbuf, latest_offset, (off + len) - latest_offset);
|
|
+ }
|
|
+ }
|
|
+ };
|
|
+ BufferedWriter bufferedwriter = new BufferedWriter(new java.io.OutputStreamWriter(bufferedOutputStream, java.nio.charset.StandardCharsets.UTF_8.newEncoder()));
|
|
+ // Paper end
|
|
|
|
try {
|
|
this.properties.store(bufferedwriter, "Minecraft server properties");
|