PlayerList API

PlazmaMC · Dec 25, 2024 · 1999dcd · 1999dcd
1 parent b136873
commit 1999dcd
Show file tree

Hide file tree

Showing 44 changed files with 1,737 additions and 450 deletions.
diff --git a/patches/api/0010-Add-PlayerList-API.patch b/patches/api/0010-Add-PlayerList-API.patch
diff --git a/patches/server/0009-Setup-basic-configuration-sections.patch b/patches/server/0009-Setup-basic-configuration-sections.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Setup basic configuration sections
 
 
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index b638690d5cd2360444e6c525f97f634d8e1dc60e..35d5bd2f7dba1aa74547b6ae994bc84a56911bf2 100644
+index b638690d5cd2360444e6c525f97f634d8e1dc60e..e89534b6e2b91483d7eddfcb3441e9addf9bccc7 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 @@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
@@ -16,10 +16,16 @@ index b638690d5cd2360444e6c525f97f634d8e1dc60e..35d5bd2f7dba1aa74547b6ae994bc84a
  import org.spongepowered.configurate.objectmapping.meta.Setting;
  import java.util.List;
 
-@@ -27,4 +28,55 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -27,4 +28,61 @@ public class GlobalConfiguration extends ConfigurationPart {
      @Setting(Configuration.VERSION_FIELD)
      int version = VERSION;
 
++    public Messages messages;
++    public class Messages extends ConfigurationPart {
++
++
++    }
++
 +    public Command command;
 +    public class Command extends ConfigurationPart {
 +

diff --git a/patches/server/0015-Tweak-console-logging.patch b/patches/server/0015-Tweak-console-logging.patch
@@ -71,10 +71,10 @@ index 5b1705794a8c3914cb11fdd35f75c8e0c128ecd0..459eea7dae68afdf7e1443f29f6f8d0c
      }
 
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 35d5bd2f7dba1aa74547b6ae994bc84a56911bf2..e153370e617e63a8e497036c93ea55dfe851bc6e 100644
+index e89534b6e2b91483d7eddfcb3441e9addf9bccc7..3a9fa2ac6dc5eaa153deb06a005be51c59786bbe 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -79,4 +79,14 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -85,4 +85,14 @@ public class GlobalConfiguration extends ConfigurationPart {
 
      }
 

diff --git a/patches/server/0018-Add-option-to-change-nether-portal-size.patch b/patches/server/0018-Add-option-to-change-nether-portal-size.patch
@@ -36,10 +36,10 @@ index acdff7b4a00d563739fd301c3633a266875296fa..1266aaf4bfcf53aa16d7b9bd697a0c48
 
      // CraftBukkit start - return boolean, add entity
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index e153370e617e63a8e497036c93ea55dfe851bc6e..11d386d3e134b1994302c4e026b6a11c46336522 100644
+index 3a9fa2ac6dc5eaa153deb06a005be51c59786bbe..f99a281244f7b736bd979cfc0bcd0787d9da9a42 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -70,6 +70,26 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -76,6 +76,26 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Structure structure;
      public class Structure extends ConfigurationPart {
 

diff --git a/patches/server/0021-Add-option-to-disable-moved-to-quickly-check-for-spe.patch b/patches/server/0021-Add-option-to-disable-moved-to-quickly-check-for-spe.patch
@@ -24,10 +24,10 @@ index c783c17d45beda8297171d0834350197808a7335..611de28d27d75b73e33a552c8a23d6c0
              return false;
          } else if (this.player.isChangingDimension()) {
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 11d386d3e134b1994302c4e026b6a11c46336522..93d746b0e7f263b36a66864834445cb41e5e2cee 100644
+index f99a281244f7b736bd979cfc0bcd0787d9da9a42..6d313edc60082a5f2d30ef8ad9fbd57772f361fe 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -37,6 +37,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -43,6 +43,7 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Player player;
      public class Player extends ConfigurationPart {
 

diff --git a/patches/server/0022-Configurable-cave-lava-sea-level.patch b/patches/server/0022-Configurable-cave-lava-sea-level.patch
@@ -33,10 +33,10 @@ index 3f39d6c786d9dfdd9ad591e08ff05fcbb41a1df6..0346fd4ab7095d66c0eef5a440afbc7a
 
      @Override
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 93d746b0e7f263b36a66864834445cb41e5e2cee..0b59a3a36c86948877cb8cb875dc114e9f9d284a 100644
+index 6d313edc60082a5f2d30ef8ad9fbd57772f361fe..5450d2a784511122a8236d30485f6b1f798822f3 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -45,6 +45,24 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -51,6 +51,24 @@ public class GlobalConfiguration extends ConfigurationPart {
      public WorldGeneration worldgen;
      public class WorldGeneration extends ConfigurationPart {
 

diff --git a/patches/server/0029-Save-Json-list-asynchronously.patch b/patches/server/0029-Save-Json-list-asynchronously.patch
diff --git a/...when-running-the-test-server-with-g.patch → ...when-running-the-test-server-with-g.patch b/...when-running-the-test-server-with-g.patch → ...when-running-the-test-server-with-g.patch
diff --git a/...nstead-if-server-favicon-doesn-t-ex.patch → ...nstead-if-server-favicon-doesn-t-ex.patch b/...nstead-if-server-favicon-doesn-t-ex.patch → ...nstead-if-server-favicon-doesn-t-ex.patch
diff --git a/...s/server/0032-Implement-FreedomChat.patch → ...s/server/0031-Implement-FreedomChat.patch b/...s/server/0032-Implement-FreedomChat.patch → ...s/server/0031-Implement-FreedomChat.patch
@@ -52,10 +52,10 @@ index 459eea7dae68afdf7e1443f29f6f8d0c68668b74..aead28160c7a5067340ec80a833eafca
          player.loadGameTypes((CompoundTag) optional.orElse(null)); // CraftBukkit - decompile error
          ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, clientData);
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 0b59a3a36c86948877cb8cb875dc114e9f9d284a..6e14f6a03c7bcd820f3d787178a62844ad022332 100644
+index 5450d2a784511122a8236d30485f6b1f798822f3..a0b1239e302f0366743949a895a0539348817077 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -39,6 +39,15 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -45,6 +45,15 @@ public class GlobalConfiguration extends ConfigurationPart {
 
          public boolean checkSpectatorMovedToQuickly = !OPTIMIZE;
 

diff --git a/...lag-when-loading-maps-from-the-disk.patch → ...lag-when-loading-maps-from-the-disk.patch b/...lag-when-loading-maps-from-the-disk.patch → ...lag-when-loading-maps-from-the-disk.patch
@@ -19,10 +19,10 @@ index 26da9e7c25ef6a89482838010d8ed6bcf8c87511..71aa3b9c5604f832e764e0d7a93da467
      }
 
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 6e14f6a03c7bcd820f3d787178a62844ad022332..193e565b6d62caf278223db033351d03ff417637 100644
+index a0b1239e302f0366743949a895a0539348817077..14ba63f5ef6ad5d96972b18e1174a8a94491fa57 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -124,6 +124,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -130,6 +130,7 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Miscellaneous misc;
      public class Miscellaneous extends ConfigurationPart {
 

diff --git a/...hopper-checks-if-the-target-contain.patch → ...hopper-checks-if-the-target-contain.patch b/...hopper-checks-if-the-target-contain.patch → ...hopper-checks-if-the-target-contain.patch
diff --git a/...ppress-errors-from-dirty-attributes.patch → ...ppress-errors-from-dirty-attributes.patch b/...ppress-errors-from-dirty-attributes.patch → ...ppress-errors-from-dirty-attributes.patch
diff --git a/...er/0036-Implement-Rail-Optimazition.patch → ...er/0035-Implement-Rail-Optimazition.patch b/...er/0036-Implement-Rail-Optimazition.patch → ...er/0035-Implement-Rail-Optimazition.patch
diff --git a/...037-Load-player-data-asynchronously.patch → ...036-Load-player-data-asynchronously.patch b/...037-Load-player-data-asynchronously.patch → ...036-Load-player-data-asynchronously.patch
@@ -56,10 +56,10 @@ index aead28160c7a5067340ec80a833eafcab1817d67..c18868796957c0756aca3b5a15fd0d0c
          // CraftBukkit start - Better rename detection
          if (optional.isPresent()) {
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 193e565b6d62caf278223db033351d03ff417637..7f30fa1928e1a7e59ee5acfdfd2334f810c30243 100644
+index 14ba63f5ef6ad5d96972b18e1174a8a94491fa57..c2f3facf65aa2682306c64c3466357461a76f267 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -38,6 +38,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -44,6 +44,7 @@ public class GlobalConfiguration extends ConfigurationPart {
      public class Player extends ConfigurationPart {
 
          public boolean checkSpectatorMovedToQuickly = !OPTIMIZE;

diff --git a/...rable-RandomSource-factory-provider.patch → ...rable-RandomSource-factory-provider.patch b/...rable-RandomSource-factory-provider.patch → ...rable-RandomSource-factory-provider.patch
diff --git a/...ize-advancement-criteria-triggering.patch → ...ize-advancement-criteria-triggering.patch b/...ize-advancement-criteria-triggering.patch → ...ize-advancement-criteria-triggering.patch
@@ -51,10 +51,10 @@ index ebbad97920df3d1645637e646a98e16cb04d361e..a149c949a042e1d1e504d9f5ce0bfa6d
          int j = 0;
          int k = 0;
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 7f30fa1928e1a7e59ee5acfdfd2334f810c30243..ba2c7b679f68d49add77731383bf68292fe9614a 100644
+index c2f3facf65aa2682306c64c3466357461a76f267..8914159c17b3c8b0114e88c5317df5f17b05e5d6 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -139,4 +139,16 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -145,4 +145,16 @@ public class GlobalConfiguration extends ConfigurationPart {
 
      }
 

diff --git a/...40-Configurable-water-flowing-speed.patch → ...39-Configurable-water-flowing-speed.patch b/...40-Configurable-water-flowing-speed.patch → ...39-Configurable-water-flowing-speed.patch
diff --git a/patches/server/0041-Cleanup-logs.patch → patches/server/0040-Cleanup-logs.patch b/patches/server/0041-Cleanup-logs.patch → patches/server/0040-Cleanup-logs.patch
diff --git a/...etely-remove-timings-implementation.patch → ...etely-remove-timings-implementation.patch b/...etely-remove-timings-implementation.patch → ...etely-remove-timings-implementation.patch
diff --git a/...43-Remove-persist-isClientSide-flag.patch → ...42-Remove-persist-isClientSide-flag.patch b/...43-Remove-persist-isClientSide-flag.patch → ...42-Remove-persist-isClientSide-flag.patch
diff --git a/...-Process-pathfinding-asynchronously.patch → ...-Process-pathfinding-asynchronously.patch b/...-Process-pathfinding-asynchronously.patch → ...-Process-pathfinding-asynchronously.patch
@@ -1301,10 +1301,10 @@ index 1c83926923f50fb4da1a83dc91614c20a831555f..aec2d0f9a957be65d031957dbff874d8
 
          Command.broadcastCommandMessage(sender, text("Successfully reloaded Plazma configuration files.", NamedTextColor.GREEN));
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index ba2c7b679f68d49add77731383bf68292fe9614a..81f7ac9753058aa72dea5704fc9859ba3b909fb1 100644
+index 8914159c17b3c8b0114e88c5317df5f17b05e5d6..92de32ee00bc9c4e8750773bca95a9cf5fbae067 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -80,6 +80,26 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -86,6 +86,26 @@ public class GlobalConfiguration extends ConfigurationPart {
      public class Entity extends ConfigurationPart {
 
 

diff --git a/...t-alternative-noise-chunk-generator.patch → ...t-alternative-noise-chunk-generator.patch b/...t-alternative-noise-chunk-generator.patch → ...t-alternative-noise-chunk-generator.patch
@@ -218,10 +218,10 @@ index 0e6dfe2635ea5f5e410049b05f94f5083b2f18a4..584311a00c5037a6d5bc05b1261969aa
          return null;
      }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 81f7ac9753058aa72dea5704fc9859ba3b909fb1..dc632fe50e777c019705796602debc3a7f33152d 100644
+index 92de32ee00bc9c4e8750773bca95a9cf5fbae067..fbcbbba15e8f7f8ea812a75d807908925305cb29 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -55,6 +55,8 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -61,6 +61,8 @@ public class GlobalConfiguration extends ConfigurationPart {
      public WorldGeneration worldgen;
      public class WorldGeneration extends ConfigurationPart {
 
@@ -230,7 +230,7 @@ index 81f7ac9753058aa72dea5704fc9859ba3b909fb1..dc632fe50e777c019705796602debc3a
          public LavaSea lavaSea;
          public class LavaSea extends ConfigurationPart {
 
-@@ -74,6 +76,11 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -80,6 +82,11 @@ public class GlobalConfiguration extends ConfigurationPart {
 
          }
 

diff --git a/patches/server/0046-Reduce-allocations.patch → patches/server/0045-Reduce-allocations.patch b/patches/server/0046-Reduce-allocations.patch → patches/server/0045-Reduce-allocations.patch
@@ -659,10 +659,10 @@ index ab6a7d20f5473d8bffa7f8d136c1d55f17bbfaff..dce1796f0a7dbc69596b0348f42fe8d5
          CommonListenerCookie commonlistenercookie = CommonListenerCookie.createInitial((GameProfile) Objects.requireNonNull(this.authenticatedProfile), this.transferred);
          ServerConfigurationPacketListenerImpl serverconfigurationpacketlistenerimpl = new ServerConfigurationPacketListenerImpl(this.server, this.connection, commonlistenercookie, this.player); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index 0735a0bd182635e1969d19336b46bc72b14e555f..efa47456c3be9a168457bfb19878a93ab26172f3 100644
+index c038da20b76c0b7b1c18471b20be01e849d29f3a..14e20543d097efb999c4ef3eb8fff641616622cf 100644
 --- a/src/main/java/net/minecraft/server/players/StoredUserList.java
 +++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
-@@ -64,7 +64,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -76,7 +76,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
      }
 
      public String[] getUserList() {

diff --git a/...es/server/0047-Hashed-rcon-password.patch → ...es/server/0046-Hashed-rcon-password.patch b/...es/server/0047-Hashed-rcon-password.patch → ...es/server/0046-Hashed-rcon-password.patch
diff --git a/...-Add-option-to-allow-shoot-fireball.patch → ...-Add-option-to-allow-shoot-fireball.patch b/...-Add-option-to-allow-shoot-fireball.patch → ...-Add-option-to-allow-shoot-fireball.patch
diff --git a/...r/0049-Remove-Mojang-Profiler-codes.patch → ...r/0048-Remove-Mojang-Profiler-codes.patch b/...r/0049-Remove-Mojang-Profiler-codes.patch → ...r/0048-Remove-Mojang-Profiler-codes.patch
diff --git a/...0-Completely-remove-Mojang-profiler.patch → ...9-Completely-remove-Mojang-profiler.patch b/...0-Completely-remove-Mojang-profiler.patch → ...9-Completely-remove-Mojang-profiler.patch
diff --git a/...051-Port-minor-SparklyPaper-patches.patch → ...050-Port-minor-SparklyPaper-patches.patch b/...051-Port-minor-SparklyPaper-patches.patch → ...050-Port-minor-SparklyPaper-patches.patch
diff --git a/...Optimize-framed-map-tracker-ticking.patch → ...Optimize-framed-map-tracker-ticking.patch b/...Optimize-framed-map-tracker-ticking.patch → ...Optimize-framed-map-tracker-ticking.patch
diff --git a/...-executeTick-check-if-there-s-no-ta.patch → ...-executeTick-check-if-there-s-no-ta.patch b/...-executeTick-check-if-there-s-no-ta.patch → ...-executeTick-check-if-there-s-no-ta.patch
diff --git a/...ver/0054-SparklyPaper-MSPT-by-World.patch → ...ver/0053-SparklyPaper-MSPT-by-World.patch b/...ver/0054-SparklyPaper-MSPT-by-World.patch → ...ver/0053-SparklyPaper-MSPT-by-World.patch
diff --git a/...55-SparklyPaper-Optimize-farm-check.patch → ...54-SparklyPaper-Optimize-farm-check.patch b/...55-SparklyPaper-Optimize-farm-check.patch → ...54-SparklyPaper-Optimize-farm-check.patch
diff --git a/...-SparklyPaper-Optimize-season-check.patch → ...-SparklyPaper-Optimize-season-check.patch b/...-SparklyPaper-Optimize-season-check.patch → ...-SparklyPaper-Optimize-season-check.patch
@@ -123,10 +123,10 @@ index 0000000000000000000000000000000000000000..530bac5a415c8597ae76ec603c1d8158
 +
 +}
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index dc632fe50e777c019705796602debc3a7f33152d..914f0d59801250d4e738a8595c747fd1e766d13f 100644
+index fbcbbba15e8f7f8ea812a75d807908925305cb29..768cb135081c233a820566015ed58351e417c45c 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -153,6 +153,17 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -159,6 +159,17 @@ public class GlobalConfiguration extends ConfigurationPart {
      public class Miscellaneous extends ConfigurationPart {
 
          public boolean resetDirtyWhenLoadingMapsFromDisk = false;

diff --git a/...lyPaper-Optimize-tickingBlockEntity.patch → ...lyPaper-Optimize-tickingBlockEntity.patch b/...lyPaper-Optimize-tickingBlockEntity.patch → ...lyPaper-Optimize-tickingBlockEntity.patch
diff --git a/patches/server/0058-Ticking-Controller.patch → patches/server/0057-Ticking-Controller.patch b/patches/server/0058-Ticking-Controller.patch → patches/server/0057-Ticking-Controller.patch
@@ -226,10 +226,10 @@ index 028aea6640356ba80f5d682e3cc03b7f82f5b9c7..d788849dc5a568d455cd83ca5b6e1b4b
 
      @Override
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 914f0d59801250d4e738a8595c747fd1e766d13f..7ea1b7e41557b7960b65b2e6d2dcb6fd2f9a24af 100644
+index 768cb135081c233a820566015ed58351e417c45c..898f9e6ec6f306a15639ee0d03bcfe7bf55e2c6c 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -189,4 +189,39 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -195,4 +195,39 @@ public class GlobalConfiguration extends ConfigurationPart {
 
      }
 

diff --git a/...on-to-disable-beacon-effect-ambient.patch → ...on-to-disable-beacon-effect-ambient.patch b/...on-to-disable-beacon-effect-ambient.patch → ...on-to-disable-beacon-effect-ambient.patch
diff --git a/.../server/0060-Tick-toggle-subcommand.patch → .../server/0059-Tick-toggle-subcommand.patch b/.../server/0060-Tick-toggle-subcommand.patch → .../server/0059-Tick-toggle-subcommand.patch
diff --git a/patches/server/0064-Add-heal-command.patch → patches/server/0060-Add-heal-command.patch b/patches/server/0064-Add-heal-command.patch → patches/server/0060-Add-heal-command.patch
diff --git a/...-argument-place-for-compass-command.patch → ...-argument-place-for-compass-command.patch b/...-argument-place-for-compass-command.patch → ...-argument-place-for-compass-command.patch