diff --git a/Paper b/Paper index 3cd952e225..8e972bf5aa 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 3cd952e22578d6710e2620a95e158255a85bd22b +Subproject commit 8e972bf5aa47978a28fc23e64ba400dcf2842f6b diff --git a/current-paper b/current-paper index fdf5e4829b..d567668ccb 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15--242585d44b7b5fe94235be94f9fd38a440b2b6dd +1.15.1--9fd4c3d54af321c54edf2847c62bf90b4785f4a4 diff --git a/patches/api/0001-Rebrand.patch b/patches/api/0001-Rebrand.patch index 366a04c779..03c58a1ceb 100644 --- a/patches/api/0001-Rebrand.patch +++ b/patches/api/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From 11f46cad08f4997f18cc7857f61771b73b2f4009 Mon Sep 17 00:00:00 2001 +From 8841ac5cfa4279d1c536f583e8923bebe49b728b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 00:57:16 -0500 Subject: [PATCH] Rebrand @@ -8,7 +8,7 @@ Subject: [PATCH] Rebrand 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml -index 1179fd556..f36461cf9 100644 +index 252ddd226..24f885767 100644 --- a/pom.xml +++ b/pom.xml @@ -3,18 +3,17 @@ @@ -25,7 +25,7 @@ index 1179fd556..f36461cf9 100644 - com.destroystokyo.paper - paper-api + purpur-api - 1.15-R0.1-SNAPSHOT + 1.15.1-R0.1-SNAPSHOT jar - Paper-API diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 0f3558c925..19b52e375a 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From 9af56364f87ffd81d371289b05eb125849562eb0 Mon Sep 17 00:00:00 2001 +From 4a95ea019473f8203a2d0e137ca873e647cb7d66 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java diff --git a/pom.xml b/pom.xml -index d10c219e3f..bace3fa775 100644 +index 495e11f0f..f0fc55ba9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -25,7 +25,7 @@ index d10c219e3f..bace3fa775 100644 - paper + purpur jar - 1.15-R0.1-SNAPSHOT + 1.15.1-R0.1-SNAPSHOT - Paper - https://papermc.io + Purpur @@ -73,7 +73,7 @@ index d10c219e3f..bace3fa775 100644 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index cd6e259239..bb227bc0fb 100644 +index cd6e25923..bb227bc0f 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole { @@ -86,7 +86,7 @@ index cd6e259239..bb227bc0fb 100644 ); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 664c48d688..8596d1c2e6 100644 +index 664c48d68..8596d1c2e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1473,7 +1473,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 22 Jul 2019 17:32:17 -0500 Subject: [PATCH] Implement configurable search radius for villagers to spawn @@ -10,10 +10,10 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn 2 files changed, 8 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 7ea55c9393..e5361be33a 100644 +index 572723005..b3a0295ae 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java -@@ -871,6 +871,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation +@@ -874,6 +874,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @Nullable private EntityIronGolem fb() { @@ -22,7 +22,7 @@ index 7ea55c9393..e5361be33a 100644 int i = 0; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a934099d81..8d01cdc8e3 100644 +index a934099d8..8d01cdc8e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -123,4 +123,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0045-Implement-elytra-settings.patch b/patches/server/0045-Implement-elytra-settings.patch index cbd198aec0..5921a8add4 100644 --- a/patches/server/0045-Implement-elytra-settings.patch +++ b/patches/server/0045-Implement-elytra-settings.patch @@ -1,4 +1,4 @@ -From eba616d0174d1b56458799b7944350a89fffc7d4 Mon Sep 17 00:00:00 2001 +From 24079d34d7c2c8ed404993c937c873cff1b2e606 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 25 Jul 2019 18:07:37 -0500 Subject: [PATCH] Implement elytra settings @@ -13,7 +13,7 @@ Subject: [PATCH] Implement elytra settings 6 files changed, 50 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 7581316497..7d424040cc 100644 +index 758131649..7d424040c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2652,9 +2652,16 @@ public abstract class EntityLiving extends Entity { @@ -45,7 +45,7 @@ index 7581316497..7d424040cc 100644 this.world.broadcastEntityEffect(this, d(enumitemslot)); } diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java -index a43e52889f..cc8fbccd16 100644 +index a43e52889..cc8fbccd1 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -39,6 +39,14 @@ public class ItemFireworks extends Item { @@ -64,7 +64,7 @@ index a43e52889f..cc8fbccd16 100644 itemstack.subtract(1); } else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 222a8fdc3b..5379d0e0d8 100644 +index d09f0b3f7..eafce44b3 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -401,7 +401,7 @@ public final class ItemStack { @@ -90,10 +90,10 @@ index 222a8fdc3b..5379d0e0d8 100644 if (this.count == 1 && t0 instanceof EntityHuman) { org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) t0, this); diff --git a/src/main/java/net/minecraft/server/ItemTrident.java b/src/main/java/net/minecraft/server/ItemTrident.java -index b8c36e9b10..cff48fafa0 100644 +index 1cbaed9da..b7610aaf7 100644 --- a/src/main/java/net/minecraft/server/ItemTrident.java +++ b/src/main/java/net/minecraft/server/ItemTrident.java -@@ -93,6 +93,16 @@ public class ItemTrident extends Item { +@@ -100,6 +100,16 @@ public class ItemTrident extends Item { f2 *= f6 / f5; f3 *= f6 / f5; f4 *= f6 / f5; @@ -111,7 +111,7 @@ index b8c36e9b10..cff48fafa0 100644 entityhuman.r(20); if (entityhuman.onGround) { diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java -index 0c7f094e54..dfa2a863a0 100644 +index 0c7f094e5..dfa2a863a 100644 --- a/src/main/java/net/minecraft/server/Vec3D.java +++ b/src/main/java/net/minecraft/server/Vec3D.java @@ -97,6 +97,7 @@ public class Vec3D implements IPosition { @@ -123,7 +123,7 @@ index 0c7f094e54..dfa2a863a0 100644 return this.x * this.x + this.y * this.y + this.z * this.z; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8d01cdc8e3..059cf85f4f 100644 +index 8d01cdc8e..059cf85f4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -130,4 +130,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0060-Allow-leashing-villagers.patch b/patches/server/0060-Allow-leashing-villagers.patch index eb456e1430..b4200c9dcb 100644 --- a/patches/server/0060-Allow-leashing-villagers.patch +++ b/patches/server/0060-Allow-leashing-villagers.patch @@ -1,4 +1,4 @@ -From 12eadd5e5f9b5e9847b9eb9567dd7e39df4bb074 Mon Sep 17 00:00:00 2001 +From 60d581d85c6303cfddcbb8404c07ac16f90820f8 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 3 Oct 2019 18:08:03 -0500 Subject: [PATCH] Allow leashing villagers @@ -10,7 +10,7 @@ Subject: [PATCH] Allow leashing villagers 3 files changed, 10 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 53b45215bc..b417501cea 100644 +index 116820dd8..f9bbc0be4 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1050,6 +1050,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -22,10 +22,10 @@ index 53b45215bc..b417501cea 100644 if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) { ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder())); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 12da4a22b8..8b036c3b53 100644 +index 4ddeb8c29..51b9bfd33 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java -@@ -981,4 +981,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation +@@ -984,4 +984,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation return optional.isPresent() && optional1.isPresent() ? i - ((MinecraftSerializableLong) optional.get()).a() < 24000L && i - ((MinecraftSerializableLong) optional1.get()).a() < 36000L : false; } @@ -38,7 +38,7 @@ index 12da4a22b8..8b036c3b53 100644 + // Purpur - end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 569c5b3442..7ab88bd640 100644 +index 569c5b344..7ab88bd64 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -260,9 +260,11 @@ public class PurpurConfig { diff --git a/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index e212efb96d..9f406bafe2 100644 --- a/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -1,4 +1,4 @@ -From 83a8863a58140ca0a8b24754ae3fa168042755d9 Mon Sep 17 00:00:00 2001 +From 4528776ef7ec55a158fba1eef7fa05f5ddbdf582 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 01:42:50 -0500 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases @@ -9,10 +9,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 97c4a6773a..2bf2d2e8cb 100644 +index f72a6ca88..6aa1ad033 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1400,8 +1400,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1399,8 +1399,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return blockposition; } @@ -25,7 +25,7 @@ index 97c4a6773a..2bf2d2e8cb 100644 public boolean a(EntityHuman entityhuman, BlockPosition blockposition) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 60405821b6..a1c9c9dc2d 100644 +index ea8ae7d71..8d96d9b44 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -380,12 +380,16 @@ public class CraftWorld implements World { diff --git a/patches/server/0086-Add-sleep-options.patch b/patches/server/0086-Add-sleep-options.patch index 2c39f505ee..6eef5cec42 100644 --- a/patches/server/0086-Add-sleep-options.patch +++ b/patches/server/0086-Add-sleep-options.patch @@ -1,4 +1,4 @@ -From 91cca1e9d85a776b1aeff360f49c93eeae35371d Mon Sep 17 00:00:00 2001 +From 6b46a97b3488abc6d8689d1ad58d49d82cd31c9c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 30 Nov 2019 03:30:17 -0600 Subject: [PATCH] Add sleep options @@ -9,7 +9,7 @@ Subject: [PATCH] Add sleep options 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 2ec3e660b3..9d7122632b 100644 +index f405f0169..9d7122632 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -14,6 +14,11 @@ import java.util.OptionalInt; @@ -58,7 +58,7 @@ index 2ec3e660b3..9d7122632b 100644 this.sleepTicks = 100; } -- if (!this.world.isClientSide && this.world.J()) { +- if (!this.world.isClientSide && this.world.isDay()) { + if (!this.world.isClientSide && unableToSleepRightNow()) { // Purpur this.wakeup(false, true); } @@ -67,13 +67,13 @@ index 2ec3e660b3..9d7122632b 100644 return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_HERE); } -- if (this.world.J()) { +- if (this.world.isDay()) { + if (unableToSleepRightNow()) { // Purpur this.setRespawnPosition(blockposition, false, true); return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a1237c5b9d..f61ed338ce 100644 +index a1237c5b9..f61ed338c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -161,6 +161,13 @@ public class PurpurWorldConfig {