diff --git a/Paper b/Paper index 8a0b371c6..7329e19ce 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 8a0b371c6803027f15a3bfc66e2285955e9b8dc1 +Subproject commit 7329e19ce5c470c7daed375aaef39ddf180d5720 diff --git a/current-paper b/current-paper index e465b65c8..9affaf5bf 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--5c4898000727433664dd042a874d6d29b05f5a38 +1.15.2--833bebdb4653f254bf9680765742a5ebfbf2831b diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 012895257..60206fb53 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From 56a276c134cd6770a63b90cf1f8b049fedf6f7de Mon Sep 17 00:00:00 2001 +From 0f5433bc7ea1fc537ab605d06e3ddad2cf44984e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -233,10 +233,10 @@ index ee5c57ca2..55b849237 100644 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 6a6e4fe48..bd384024f 100644 +index 8d93ad6b4..e9942016b 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -298,7 +298,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -299,7 +299,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { diff --git a/patches/server/0010-Integrate-ridables.patch b/patches/server/0010-Integrate-ridables.patch index fb9c0eae1..cbe84fd62 100644 --- a/patches/server/0010-Integrate-ridables.patch +++ b/patches/server/0010-Integrate-ridables.patch @@ -1,4 +1,4 @@ -From fb26e478e18ba7a028d1655ddc8a37a85621e512 Mon Sep 17 00:00:00 2001 +From 2223402187e9fa667b32ad7d1b564a22842d7a7d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 30 Apr 2019 19:17:21 -0500 Subject: [PATCH] Integrate ridables @@ -116,7 +116,7 @@ index 1d9ba04da..2bade947e 100644 this.d = false; this.a.aK = this.a(this.a.aK, this.h() + 20.0F, this.b); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 863ff08fd..bdee6efe6 100644 +index 941bebcac..f5b4c7e3c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -79,6 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -176,7 +176,7 @@ index 863ff08fd..bdee6efe6 100644 this.passengers.remove(entity); entity.j = 60; } -@@ -3370,4 +3385,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -3375,4 +3390,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke void accept(Entity entity, double d0, double d1, double d2); } @@ -1317,7 +1317,7 @@ index 5782a25ec..dbe022340 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 2edb99b63..d5e8831f1 100644 +index 584166f22..de22cad76 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -374,9 +374,21 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/patches/server/0027-Controllable-Minecarts.patch b/patches/server/0027-Controllable-Minecarts.patch index 67832db9c..5d80e1abb 100644 --- a/patches/server/0027-Controllable-Minecarts.patch +++ b/patches/server/0027-Controllable-Minecarts.patch @@ -1,4 +1,4 @@ -From 327f2130ddb69565f47048e2df5af0ff9d8eeddc Mon Sep 17 00:00:00 2001 +From 9b406ca83d65b05cdc393d3e267b0c09837bc877 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 29 Jun 2019 02:32:40 -0500 Subject: [PATCH] Controllable Minecarts @@ -11,7 +11,7 @@ Subject: [PATCH] Controllable Minecarts 4 files changed, 75 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index bdee6efe6..5a5531c10 100644 +index f5b4c7e3c..6ea10fb56 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1284,6 +1284,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -23,7 +23,7 @@ index bdee6efe6..5a5531c10 100644 return this.inLava; } diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 4388186db..5abd8a181 100644 +index 665bbe07f..1b982a510 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -8,6 +8,7 @@ import java.util.List; @@ -34,7 +34,7 @@ index 4388186db..5abd8a181 100644 // CraftBukkit start import org.bukkit.Location; import org.bukkit.entity.Vehicle; -@@ -355,12 +356,50 @@ public abstract class EntityMinecartAbstract extends Entity { +@@ -357,12 +358,50 @@ public abstract class EntityMinecartAbstract extends Entity { public void a(int i, int j, int k, boolean flag) {} diff --git a/patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch index df8614b8e..b6359191f 100644 --- a/patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch +++ b/patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch @@ -1,4 +1,4 @@ -From 877f9dfcb737f543b84fb49c12f7ddcb390d6f08 Mon Sep 17 00:00:00 2001 +From 9088e3e2ea32fb54c89c4c66fd0d99411add6d90 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 7 Sep 2019 22:47:59 -0500 Subject: [PATCH] Add option for boats to eject players on land @@ -9,10 +9,10 @@ Subject: [PATCH] Add option for boats to eject players on land 2 files changed, 6 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java -index 03624bbd6a..36969eeb2b 100644 +index 563fc8ced..479ed7c7b 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java -@@ -427,6 +427,7 @@ public class EntityBoat extends Entity { +@@ -431,6 +431,7 @@ public class EntityBoat extends Entity { if (f > 0.0F) { this.aE = f; @@ -21,7 +21,7 @@ index 03624bbd6a..36969eeb2b 100644 } else { return EntityBoat.EnumStatus.IN_AIR; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 38d85c6389..b2c62de053 100644 +index 38d85c638..b2c62de05 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -70,6 +70,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0087-Make-the-GUI-better.patch b/patches/server/0087-Make-the-GUI-better.patch index 6de696336..d92ae6002 100644 --- a/patches/server/0087-Make-the-GUI-better.patch +++ b/patches/server/0087-Make-the-GUI-better.patch @@ -1,4 +1,4 @@ -From ccac65fb797842f093e4f04c6750152a193afeaf Mon Sep 17 00:00:00 2001 +From 18b9102c49cd9cf5d273bca99ea956b79baa31eb Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 16 Jan 2020 14:59:16 -0600 Subject: [PATCH] Make the GUI better @@ -793,7 +793,7 @@ index 000000000..c4519794c + } +} diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 869bff4af..2a3e57c2f 100644 +index a9bb98765..707ade70a 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -2,7 +2,16 @@ @@ -812,8 +812,8 @@ index 869bff4af..2a3e57c2f 100644 + + - - + + -- 2.24.0 diff --git a/patches/server/0091-Add-player-death-exp-control-options.patch b/patches/server/0091-Add-player-death-exp-control-options.patch index b83ad99c8..c282fc8fd 100644 --- a/patches/server/0091-Add-player-death-exp-control-options.patch +++ b/patches/server/0091-Add-player-death-exp-control-options.patch @@ -1,4 +1,4 @@ -From f6ead952367f2367164bdf5592a8957f4c267827 Mon Sep 17 00:00:00 2001 +From d0783acf1d4f859da0f39bd0f9c36fa502734160 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Dec 2019 22:08:37 -0600 Subject: [PATCH] Add player death exp control options @@ -9,10 +9,10 @@ Subject: [PATCH] Add player death exp control options 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 5991a41c1..b6459cd47 100644 +index 7b54b02e2..69ac51935 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1859,9 +1859,18 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1866,9 +1866,18 @@ public abstract class EntityHuman extends EntityLiving { @Override protected int getExpValue(EntityHuman entityhuman) { if (!this.world.getGameRules().getBoolean(GameRules.KEEP_INVENTORY) && !this.isSpectator()) {