diff --git a/Paper b/Paper index d0ad658b0..c712f2c05 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit d0ad658b0c84dd3a185fba6b5b4a95703eb72312 +Subproject commit c712f2c0533e00ff62793f3df14be9afb45f84c7 diff --git a/current-paper b/current-paper index afeb8485d..7bbf97ac4 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.3--6ba4ed5238bb4963a86e613d22f6e8e367f44436 +1.16.3--15e754bfe56a3d1f5ec8d0d16ef0d96ac55219aa diff --git a/patches/server/0030-Disable-outdated-build-check.patch b/patches/server/0030-Disable-outdated-build-check.patch index f81bd8fea..9190a903e 100644 --- a/patches/server/0030-Disable-outdated-build-check.patch +++ b/patches/server/0030-Disable-outdated-build-check.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Disable outdated build check diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 3261d2255..2825f5a3a 100644 +index 3313d316fa..94aa512c45 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -259,7 +259,7 @@ public class Main { System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper } -- if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { +- if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { + if (false) { // Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { // Purpur Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper diff --git a/patches/server/0126-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0126-Despawn-rate-config-options-per-projectile-type.patch index 3615d98db..67a60ac41 100644 --- a/patches/server/0126-Despawn-rate-config-options-per-projectile-type.patch +++ b/patches/server/0126-Despawn-rate-config-options-per-projectile-type.patch @@ -192,10 +192,10 @@ index 226b346436..b482dce83b 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntitySmallFireball.java b/src/main/java/net/minecraft/server/EntitySmallFireball.java -index 92efb29534..f884e4cf7a 100644 +index 350e92ac99..4ed7a20bfe 100644 --- a/src/main/java/net/minecraft/server/EntitySmallFireball.java +++ b/src/main/java/net/minecraft/server/EntitySmallFireball.java -@@ -88,4 +88,11 @@ public class EntitySmallFireball extends EntityFireballFireball { +@@ -86,4 +86,11 @@ public class EntitySmallFireball extends EntityFireballFireball { public boolean damageEntity(DamageSource damagesource, float f) { return false; } @@ -300,7 +300,7 @@ index 9a17eb6066..f0b8982893 100644 public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9e03fd5d89..24b3c7c19c 100644 +index 07c1b2ca63..8ff4e3127b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -147,6 +147,35 @@ public class PurpurWorldConfig {