diff --git a/Paper b/Paper index 1eeb8ad14..fcbeac8a9 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 1eeb8ad14b410bad79e306b6604a6e43b0e779cf +Subproject commit fcbeac8a992eb18ef31de4886a1311bf8364dbe4 diff --git a/current-paper b/current-paper index 32f7cbf0c..3c9cfed4a 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.1--4f5c5bbd9511d097bf08cb0c141f3cd78275b35e +1.16.1--825c40bcd56bcd79b12afad3d005fe5db24721d3 diff --git a/patches/api/0001-Tuinity-API-Changes.patch b/patches/api/0001-Tuinity-API-Changes.patch index 1ce59c793..d4ceb9c35 100644 --- a/patches/api/0001-Tuinity-API-Changes.patch +++ b/patches/api/0001-Tuinity-API-Changes.patch @@ -1,12 +1,8 @@ -From c666bb03ff971b242661f09f9df8a48efb1145db Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 14 Dec 2018 21:52:29 -0800 Subject: [PATCH] Tuinity API Changes ---- - pom.xml | 12 ++++++------ - src/main/java/org/bukkit/Server.java | 8 ++++++++ - 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index dfc7c2f3..12a5e929 100644 @@ -56,6 +52,3 @@ index b464cc1a..959e4e7e 100644 /** * Sends the component to the player * --- -2.26.2 - diff --git a/patches/api/0002-Rebrand.patch b/patches/api/0002-Rebrand.patch index 993efe0ca..351e90013 100644 --- a/patches/api/0002-Rebrand.patch +++ b/patches/api/0002-Rebrand.patch @@ -1,11 +1,8 @@ -From 6cabefe5ac062e259a8ae4edf0f85628593d36a9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 00:57:16 -0500 Subject: [PATCH] Rebrand ---- - pom.xml | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 12a5e929..84c9870e 100644 @@ -44,6 +41,3 @@ index 12a5e929..84c9870e 100644 net.md-5 --- -2.26.2 - diff --git a/patches/api/0003-Purpur-config-files.patch b/patches/api/0003-Purpur-config-files.patch index 3bd79e29d..62fb63c2e 100644 --- a/patches/api/0003-Purpur-config-files.patch +++ b/patches/api/0003-Purpur-config-files.patch @@ -1,11 +1,8 @@ -From 51909d1294b8a427c02ab0edac37205069b58d78 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 18 Feb 2020 20:30:03 -0600 Subject: [PATCH] Purpur config files ---- - src/main/java/org/bukkit/Server.java | 12 ++++++++++++ - 1 file changed, 12 insertions(+) diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java index 959e4e7e..a5262420 100644 @@ -30,6 +27,3 @@ index 959e4e7e..a5262420 100644 /** * Sends the component to the player * --- -2.26.2 - diff --git a/patches/api/0004-Default-permissions.patch b/patches/api/0004-Default-permissions.patch index c2c66935c..0b6f4b179 100644 --- a/patches/api/0004-Default-permissions.patch +++ b/patches/api/0004-Default-permissions.patch @@ -1,14 +1,8 @@ -From 0105b33898fbefac968bac777201e745d11bdb73 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jun 2020 23:32:38 -0500 Subject: [PATCH] Default permissions ---- - .../util/permissions/CommandPermissions.java | 1 + - .../util/permissions/DefaultPermissions.java | 2 + - .../util/permissions/PurpurPermissions.java | 69 +++++++++++++++++++ - 3 files changed, 72 insertions(+) - create mode 100644 src/main/java/org/bukkit/util/permissions/PurpurPermissions.java diff --git a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/util/permissions/CommandPermissions.java index 7763d610..d5a42707 100644 @@ -110,6 +104,3 @@ index 00000000..14cb78e3 + return purpur; + } +} --- -2.26.2 - diff --git a/patches/api/0005-Allow-inventory-resizing.patch b/patches/api/0005-Allow-inventory-resizing.patch index 35eb0dde6..7c0a66ab1 100644 --- a/patches/api/0005-Allow-inventory-resizing.patch +++ b/patches/api/0005-Allow-inventory-resizing.patch @@ -1,11 +1,8 @@ -From 71daaa052b59b70bfdf1d26a1fc7eb85aceda055 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 06:50:55 -0500 Subject: [PATCH] Allow inventory resizing ---- - .../java/org/bukkit/event/inventory/InventoryType.java | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java index b59fec1a..e3b77f56 100644 @@ -33,6 +30,3 @@ index b59fec1a..e3b77f56 100644 public int getDefaultSize() { return size; } --- -2.26.2 - diff --git a/patches/api/0006-Advancement-API.patch b/patches/api/0006-Advancement-API.patch index 628b0c233..8e4d7648d 100644 --- a/patches/api/0006-Advancement-API.patch +++ b/patches/api/0006-Advancement-API.patch @@ -1,15 +1,8 @@ -From 187dbb6bb7a7a564c79b2db678c2fd5d9f32d964 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 31 May 2019 21:24:21 -0500 Subject: [PATCH] Advancement API ---- - .../org/bukkit/advancement/Advancement.java | 9 ++++ - .../advancement/AdvancementDisplay.java | 53 +++++++++++++++++++ - .../org/bukkit/advancement/FrameType.java | 27 ++++++++++ - 3 files changed, 89 insertions(+) - create mode 100644 src/main/java/org/bukkit/advancement/AdvancementDisplay.java - create mode 100644 src/main/java/org/bukkit/advancement/FrameType.java diff --git a/src/main/java/org/bukkit/advancement/Advancement.java b/src/main/java/org/bukkit/advancement/Advancement.java index 7c500997..432caadb 100644 @@ -128,6 +121,3 @@ index 00000000..d1757f3d + return "FrameType[name=" + name() + ",color=" + color + "]"; + } +} --- -2.26.2 - diff --git a/patches/api/0007-Llama-API.patch b/patches/api/0007-Llama-API.patch index 724e5b743..e06445aef 100644 --- a/patches/api/0007-Llama-API.patch +++ b/patches/api/0007-Llama-API.patch @@ -1,15 +1,8 @@ -From 6218971b943e4ead4f80712c59d44efb80c0511e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 22:50:05 -0500 Subject: [PATCH] Llama API ---- - .../event/entity/LlamaJoinCaravanEvent.java | 61 ++++++++++++++++++ - .../event/entity/LlamaLeaveCaravanEvent.java | 34 ++++++++++ - src/main/java/org/bukkit/entity/Llama.java | 62 +++++++++++++++++++ - 3 files changed, 157 insertions(+) - create mode 100644 src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java - create mode 100644 src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java new file mode 100644 @@ -196,6 +189,3 @@ index d23226cc..1ef9479c 100644 + Llama getCaravanTail(); + // Purpur end } --- -2.26.2 - diff --git a/patches/api/0008-Evoker-API.patch b/patches/api/0008-Evoker-API.patch index c81e694b1..dc3e6dd1a 100644 --- a/patches/api/0008-Evoker-API.patch +++ b/patches/api/0008-Evoker-API.patch @@ -1,11 +1,8 @@ -From 5f09e991c9555ba836ee891e52acd6881040d345 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:28:53 -0500 Subject: [PATCH] Evoker API ---- - src/main/java/org/bukkit/entity/Evoker.java | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) diff --git a/src/main/java/org/bukkit/entity/Evoker.java b/src/main/java/org/bukkit/entity/Evoker.java index f8d173ad..f2a03f7f 100644 @@ -33,6 +30,3 @@ index f8d173ad..f2a03f7f 100644 + void setWololoTarget(@Nullable Sheep sheep); + // Purpur end } --- -2.26.2 - diff --git a/patches/api/0009-AFK-API.patch b/patches/api/0009-AFK-API.patch index 8a70f4895..32a441ae6 100644 --- a/patches/api/0009-AFK-API.patch +++ b/patches/api/0009-AFK-API.patch @@ -1,13 +1,8 @@ -From 7fa4a397d97e8bac99b3eed5d995d6696d820ebe Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 10 Aug 2019 22:19:56 -0500 Subject: [PATCH] AFK API ---- - .../net/pl3x/purpur/event/PlayerAFKEvent.java | 70 +++++++++++++++++++ - src/main/java/org/bukkit/entity/Player.java | 21 ++++++ - 2 files changed, 91 insertions(+) - create mode 100644 src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java diff --git a/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java new file mode 100644 @@ -115,6 +110,3 @@ index 2eb31213..2dca16ac 100644 + void resetIdleTimer(); + // Purpur end } --- -2.26.2 - diff --git a/patches/api/0010-Bring-back-server-name.patch b/patches/api/0010-Bring-back-server-name.patch index 76959e80a..4f3e722ab 100644 --- a/patches/api/0010-Bring-back-server-name.patch +++ b/patches/api/0010-Bring-back-server-name.patch @@ -1,12 +1,8 @@ -From 2c69dbc2a73e148723a2011c2b78006ee23e97ae Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 May 2019 15:18:40 -0500 Subject: [PATCH] Bring back server name ---- - src/main/java/org/bukkit/Bukkit.java | 11 +++++++++++ - src/main/java/org/bukkit/Server.java | 9 +++++++++ - 2 files changed, 20 insertions(+) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java index 329e2dd1..4f6f0193 100644 @@ -46,6 +42,3 @@ index a5262420..e3808a79 100644 + String getServerName(); + // Purpur end } --- -2.26.2 - diff --git a/patches/api/0011-ExecuteCommandEvent.patch b/patches/api/0011-ExecuteCommandEvent.patch index 273491d8d..fc931e900 100644 --- a/patches/api/0011-ExecuteCommandEvent.patch +++ b/patches/api/0011-ExecuteCommandEvent.patch @@ -1,13 +1,8 @@ -From 7168d5182318a5a5c35f20bddaf992ecea957763 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 31 May 2019 00:08:28 -0500 Subject: [PATCH] ExecuteCommandEvent ---- - .../purpur/event/ExecuteCommandEvent.java | 130 ++++++++++++++++++ - .../org/bukkit/command/SimpleCommandMap.java | 15 +- - 2 files changed, 144 insertions(+), 1 deletion(-) - create mode 100644 src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java diff --git a/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java b/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java new file mode 100644 @@ -178,6 +173,3 @@ index 460fda05..1e0eb099 100644 } // target.timings.stopTiming(); // Spigot // Paper } catch (CommandException ex) { server.getPluginManager().callEvent(new ServerExceptionEvent(new ServerCommandException(ex, target, sender, args))); // Paper --- -2.26.2 - diff --git a/patches/api/0012-LivingEntity-safeFallDistance.patch b/patches/api/0012-LivingEntity-safeFallDistance.patch index 9c9f8847b..9f069eb2a 100644 --- a/patches/api/0012-LivingEntity-safeFallDistance.patch +++ b/patches/api/0012-LivingEntity-safeFallDistance.patch @@ -1,11 +1,8 @@ -From 148b37f8d2e62b7075b27b0d36dd0470b460e142 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 May 2019 12:58:19 -0500 Subject: [PATCH] LivingEntity safeFallDistance ---- - .../java/org/bukkit/entity/LivingEntity.java | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java index a60523cc..5b688cd0 100644 @@ -32,6 +29,3 @@ index a60523cc..5b688cd0 100644 + void setSafeFallDistance(float safeFallDistance); + // Purpur end } --- -2.26.2 - diff --git a/patches/api/0013-MoonPhase-API.patch b/patches/api/0013-MoonPhase-API.patch index 9962bc048..73373f97d 100644 --- a/patches/api/0013-MoonPhase-API.patch +++ b/patches/api/0013-MoonPhase-API.patch @@ -1,13 +1,8 @@ -From 429414ef1d9773c1df37641278660e4a68dea10f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 1 Feb 2020 22:22:07 -0600 Subject: [PATCH] MoonPhase API ---- - src/main/java/net/pl3x/purpur/MoonPhase.java | 36 ++++++++++++++++++++ - src/main/java/org/bukkit/World.java | 10 ++++++ - 2 files changed, 46 insertions(+) - create mode 100644 src/main/java/net/pl3x/purpur/MoonPhase.java diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java new file mode 100644 @@ -72,6 +67,3 @@ index 75c9225b..9955d741 100644 /** * Get the {@link DragonBattle} associated with this world. * --- -2.26.2 - diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0014-Lagging-threshold.patch index 03a0d33a2..50bca2c42 100644 --- a/patches/api/0014-Lagging-threshold.patch +++ b/patches/api/0014-Lagging-threshold.patch @@ -1,12 +1,8 @@ -From fadc3e9707dd05213bf119aba6d4604696729896 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 10:07:24 -0500 Subject: [PATCH] Lagging threshold ---- - src/main/java/org/bukkit/Bukkit.java | 9 +++++++++ - src/main/java/org/bukkit/Server.java | 7 +++++++ - 2 files changed, 16 insertions(+) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java index 4f6f0193..4c410f6e 100644 @@ -44,6 +40,3 @@ index e3808a79..d8c81767 100644 + boolean isLagging(); // Purpur end } --- -2.26.2 - diff --git a/patches/api/0015-ItemFactory-getMonsterEgg.patch b/patches/api/0015-ItemFactory-getMonsterEgg.patch index 52e44f911..56b8a6a38 100644 --- a/patches/api/0015-ItemFactory-getMonsterEgg.patch +++ b/patches/api/0015-ItemFactory-getMonsterEgg.patch @@ -1,11 +1,8 @@ -From 6a8e9699b7a8d5a40f88f01f62670fd9b74a7b7e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jul 2019 16:37:04 -0500 Subject: [PATCH] ItemFactory#getMonsterEgg ---- - src/main/java/org/bukkit/inventory/ItemFactory.java | 11 +++++++++++ - 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java index 03ba2265..630c15d2 100644 @@ -27,6 +24,3 @@ index 03ba2265..630c15d2 100644 + ItemStack getMonsterEgg(@Nullable org.bukkit.entity.EntityType type); + // Purpur end } --- -2.26.2 - diff --git a/patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch index f977fd70c..2c595bf1d 100644 --- a/patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch +++ b/patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch @@ -1,12 +1,8 @@ -From 192ebbf530a67ed5a3d0baed103708f95e9aa39f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jul 2019 18:21:15 -0500 Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent ---- - .../PlayerSetSpawnerTypeWithEggEvent.java | 85 +++++++++++++++++++ - 1 file changed, 85 insertions(+) - create mode 100644 src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java diff --git a/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java new file mode 100644 @@ -99,6 +95,3 @@ index 00000000..c050b75e + return handlers; + } +} --- -2.26.2 - diff --git a/patches/api/0017-EMC-MonsterEggSpawnEvent.patch b/patches/api/0017-EMC-MonsterEggSpawnEvent.patch index 4999f541c..7436a90e5 100644 --- a/patches/api/0017-EMC-MonsterEggSpawnEvent.patch +++ b/patches/api/0017-EMC-MonsterEggSpawnEvent.patch @@ -1,12 +1,8 @@ -From a9021d0f56cb27f4532c44e3ce8400bfad8563a7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 21 Nov 2016 17:02:11 -0500 Subject: [PATCH] EMC - MonsterEggSpawnEvent ---- - .../event/entity/MonsterEggSpawnEvent.java | 67 +++++++++++++++++++ - 1 file changed, 67 insertions(+) - create mode 100644 src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java diff --git a/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java new file mode 100644 @@ -81,6 +77,3 @@ index 00000000..983d6723 + return handlers; + } +} --- -2.26.2 - diff --git a/patches/api/0018-Villager-resetOffers.patch b/patches/api/0018-Villager-resetOffers.patch index 4c9c280c2..d20d5d8fd 100644 --- a/patches/api/0018-Villager-resetOffers.patch +++ b/patches/api/0018-Villager-resetOffers.patch @@ -1,11 +1,8 @@ -From 70a13007f8475a226590df7dcd9fdd6c2060de1e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 7 Oct 2019 00:15:28 -0500 Subject: [PATCH] Villager#resetOffers ---- - src/main/java/org/bukkit/entity/Villager.java | 7 +++++++ - 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java index c8777a47..ed703af4 100644 @@ -25,6 +22,3 @@ index c8777a47..ed703af4 100644 /** * Represents Villager type, usually corresponding to what biome they spawn * in. --- -2.26.2 - diff --git a/patches/api/0019-World-getPlacementBlockData.patch b/patches/api/0019-World-getPlacementBlockData.patch index 6efbabdfb..c9b81fe71 100644 --- a/patches/api/0019-World-getPlacementBlockData.patch +++ b/patches/api/0019-World-getPlacementBlockData.patch @@ -1,11 +1,8 @@ -From 8eb0a3b8e8fb7dfaef23c02f6f3ce2183461047c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:34:36 -0500 Subject: [PATCH] World#getPlacementBlockData ---- - src/main/java/org/bukkit/World.java | 10 ++++++++++ - 1 file changed, 10 insertions(+) diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java index 9955d741..95042597 100644 @@ -28,6 +25,3 @@ index 9955d741..95042597 100644 // Purpur end /** --- -2.26.2 - diff --git a/patches/api/0020-LivingEntity-playPickupItemAnimation.patch b/patches/api/0020-LivingEntity-playPickupItemAnimation.patch index cfe52336f..a6de5e83a 100644 --- a/patches/api/0020-LivingEntity-playPickupItemAnimation.patch +++ b/patches/api/0020-LivingEntity-playPickupItemAnimation.patch @@ -1,11 +1,8 @@ -From d5561b9fc5626a9d263d12145c58eb2f39a4bcca Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:25:05 -0500 Subject: [PATCH] LivingEntity#playPickupItemAnimation ---- - .../java/org/bukkit/entity/LivingEntity.java | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java index 5b688cd0..a0db7694 100644 @@ -34,6 +31,3 @@ index 5b688cd0..a0db7694 100644 + void playPickupItemAnimation(@NotNull Item item, int quantity); // Purpur end } --- -2.26.2 - diff --git a/patches/api/0021-SkeletonHorseTrapEvent-getPlayer.patch b/patches/api/0021-SkeletonHorseTrapEvent-getPlayer.patch index 739aef29a..bdc52fc33 100644 --- a/patches/api/0021-SkeletonHorseTrapEvent-getPlayer.patch +++ b/patches/api/0021-SkeletonHorseTrapEvent-getPlayer.patch @@ -1,11 +1,8 @@ -From b9d3e5804fc24259bf59943ac14de4a3416a4856 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:35:24 -0500 Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer ---- - .../event/entity/SkeletonHorseTrapEvent.java | 24 +++++++++++++++++++ - 1 file changed, 24 insertions(+) diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java index d79dbcd6..1ed3ea8f 100644 @@ -63,6 +60,3 @@ index d79dbcd6..1ed3ea8f 100644 @Override public boolean isCancelled() { return cancelled; --- -2.26.2 - diff --git a/patches/api/0022-PaperPR-PlayerItemCooldownEvent.patch b/patches/api/0022-PaperPR-PlayerItemCooldownEvent.patch index 654ce90e5..8a4cd16a9 100644 --- a/patches/api/0022-PaperPR-PlayerItemCooldownEvent.patch +++ b/patches/api/0022-PaperPR-PlayerItemCooldownEvent.patch @@ -1,12 +1,8 @@ -From 855fc3bdef2953107a8e75a953c086a7866eb024 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Mon, 20 Apr 2020 13:57:13 +0200 Subject: [PATCH] PaperPR - PlayerItemCooldownEvent ---- - .../event/player/PlayerItemCooldownEvent.java | 77 +++++++++++++++++++ - 1 file changed, 77 insertions(+) - create mode 100644 src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java diff --git a/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java new file mode 100644 @@ -91,6 +87,3 @@ index 00000000..2002909f + return handlers; + } +} --- -2.26.2 - diff --git a/patches/api/0023-EntityMoveEvent.patch b/patches/api/0023-EntityMoveEvent.patch index a349657a9..7fe49f006 100644 --- a/patches/api/0023-EntityMoveEvent.patch +++ b/patches/api/0023-EntityMoveEvent.patch @@ -1,12 +1,8 @@ -From 9c6e4fddc16253233e0cca1d093e76d8c4ac64a9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 11 Feb 2020 21:56:38 -0600 Subject: [PATCH] EntityMoveEvent ---- - .../purpur/event/entity/EntityMoveEvent.java | 95 +++++++++++++++++++ - 1 file changed, 95 insertions(+) - create mode 100644 src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java new file mode 100644 @@ -109,6 +105,3 @@ index 00000000..c48c525b + return handlers; + } +} --- -2.26.2 - diff --git a/patches/api/0024-PaperPR-BellRingEvent.patch b/patches/api/0024-PaperPR-BellRingEvent.patch index b0acd64a3..057701ee3 100644 --- a/patches/api/0024-PaperPR-BellRingEvent.patch +++ b/patches/api/0024-PaperPR-BellRingEvent.patch @@ -1,14 +1,10 @@ -From 13467a78b38df42ecee499849c1bf9ceb914bfdf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Eearslya Sleiarion Date: Mon, 24 Jun 2019 21:27:39 -0700 Subject: [PATCH] PaperPR - BellRingEvent Add a new event, BellRingEvent, to trigger whenever a player rings a village bell. Passes along the bell block and the player who rang it. ---- - .../paper/event/block/BellRingEvent.java | 53 +++++++++++++++++++ - 1 file changed, 53 insertions(+) - create mode 100644 src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java diff --git a/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java new file mode 100644 @@ -69,6 +65,3 @@ index 00000000..82e0a747 + return handlers; + } +} --- -2.26.2 - diff --git a/patches/api/0025-Player-invulnerabilities.patch b/patches/api/0025-Player-invulnerabilities.patch index 08b357f5d..df753ee5d 100644 --- a/patches/api/0025-Player-invulnerabilities.patch +++ b/patches/api/0025-Player-invulnerabilities.patch @@ -1,11 +1,8 @@ -From 471dd5a530419f3dc9af3601d37ef3f2957291c5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 2 May 2020 20:55:31 -0500 Subject: [PATCH] Player invulnerabilities ---- - src/main/java/org/bukkit/entity/Player.java | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java index 2dca16ac..55edcd54 100644 @@ -38,6 +35,3 @@ index 2dca16ac..55edcd54 100644 + void setSpawnInvulnerableTicks(int invulnerableTicks); // Purpur end } --- -2.26.2 - diff --git a/patches/api/0026-Anvil-API.patch b/patches/api/0026-Anvil-API.patch index 360f1b4a6..6c4fc3848 100644 --- a/patches/api/0026-Anvil-API.patch +++ b/patches/api/0026-Anvil-API.patch @@ -1,15 +1,8 @@ -From 2e6244aec6bbbb3846c4ba2c59998c44e605ace9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 19 Apr 2020 00:25:09 -0500 Subject: [PATCH] Anvil API ---- - .../event/inventory/AnvilTakeResultEvent.java | 52 +++++++++++++++++++ - .../inventory/AnvilUpdateResultEvent.java | 35 +++++++++++++ - .../org/bukkit/inventory/AnvilInventory.java | 10 ++++ - 3 files changed, 97 insertions(+) - create mode 100644 src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java - create mode 100644 src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java new file mode 100644 @@ -129,6 +122,3 @@ index b95e563b..435026e5 100644 + void setDoUnsafeEnchants(boolean canDoUnsafeEnchants); + // Purpur end } --- -2.26.2 - diff --git a/patches/api/0027-ItemStack-convenience-methods.patch b/patches/api/0027-ItemStack-convenience-methods.patch index 75f9f034f..9664fdffc 100644 --- a/patches/api/0027-ItemStack-convenience-methods.patch +++ b/patches/api/0027-ItemStack-convenience-methods.patch @@ -1,12 +1,8 @@ -From 90d4f270ec4296b0f0c013e8d3a97a5c4babe79a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 15 Mar 2020 20:52:12 -0500 Subject: [PATCH] ItemStack convenience methods ---- - src/main/java/org/bukkit/Material.java | 32 + - .../java/org/bukkit/inventory/ItemStack.java | 619 ++++++++++++++++++ - 2 files changed, 651 insertions(+) diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java index 3a8438fb..e7167d11 100644 @@ -684,6 +680,3 @@ index ccd81fca..c38fd840 100644 + + // Purpur end } --- -2.26.2 - diff --git a/patches/api/0028-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/api/0028-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 3ec82d01a..8e48d441d 100644 --- a/patches/api/0028-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/api/0028-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -1,11 +1,8 @@ -From 20a60758768a69b9083d1c079b15571860979291 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 28 Jun 2020 21:50:55 -0500 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms ---- - .../java/com/destroystokyo/paper/entity/ai/VanillaGoal.java | 4 ++++ - 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java index d7f1b2c8..8d25b6f0 100644 @@ -20,6 +17,3 @@ index d7f1b2c8..8d25b6f0 100644 + GoalKey ORBIT_CRYSTAL_GOAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal_goal")); + // Purpur end } --- -2.26.2 - diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index f7e349eaa..b25892816 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -1,4 +1,4 @@ -From 049e07a77b3110ad4685e5e2ffc797f7410a1650 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 14 Dec 2018 21:53:58 -0800 Subject: [PATCH] Tuinity Server Changes @@ -216,99 +216,6 @@ Prevent log spam for "Block is water but TE is chest" Happens when breaking a waterlogged chest. Fix is to just not validate the TE while the chest is being removed. ---- - pom.xml | 22 +- - .../co/aikar/timings/MinecraftTimings.java | 2 + - .../java/co/aikar/timings/TimingsExport.java | 3 +- - .../paper/PaperVersionFetcher.java | 11 +- - .../paper/server/ticklist/PaperTickList.java | 9 + - .../chunk/SingleThreadChunkRegionManager.java | 159 ++++++ - .../tuinity/tuinity/config/TuinityConfig.java | 277 ++++++++++ - .../com/tuinity/tuinity/util/CachedLists.java | 53 ++ - .../com/tuinity/tuinity/util/TickThread.java | 41 ++ - .../IteratorSafeOrderedReferenceSet.java | 265 +++++++++ - .../tuinity/tuinity/voxel/AABBVoxelShape.java | 246 +++++++++ - .../net/minecraft/server/AxisAlignedBB.java | 116 ++++ - .../java/net/minecraft/server/BiomeBase.java | 12 + - .../java/net/minecraft/server/BlockBase.java | 1 + - .../java/net/minecraft/server/BlockChest.java | 4 +- - .../net/minecraft/server/BlockPiston.java | 30 +- - .../minecraft/server/BlockPistonMoving.java | 7 +- - src/main/java/net/minecraft/server/Chunk.java | 37 ++ - .../minecraft/server/ChunkMapDistance.java | 93 +++- - .../minecraft/server/ChunkProviderServer.java | 286 ++++++++-- - .../minecraft/server/ChunkRegionLoader.java | 12 +- - .../net/minecraft/server/ChunkSection.java | 1 + - .../net/minecraft/server/ChunkStatus.java | 4 +- - .../minecraft/server/DataPaletteBlock.java | 1 + - .../net/minecraft/server/DedicatedServer.java | 1 + - src/main/java/net/minecraft/server/EULA.java | 2 +- - .../java/net/minecraft/server/Entity.java | 201 ++++++- - .../net/minecraft/server/EntityLiving.java | 9 +- - .../minecraft/server/EntityTrackerEntry.java | 1 + - .../java/net/minecraft/server/HeightMap.java | 5 +- - .../java/net/minecraft/server/IBlockData.java | 13 + - .../net/minecraft/server/IChunkLoader.java | 2 +- - .../minecraft/server/ICollisionAccess.java | 5 + - .../net/minecraft/server/IEntityAccess.java | 1 + - .../minecraft/server/LightEngineStorage.java | 7 +- - .../java/net/minecraft/server/MCUtil.java | 14 + - .../net/minecraft/server/MinecraftServer.java | 108 +++- - .../net/minecraft/server/NetworkManager.java | 59 +- - .../server/PacketPlayOutMapChunk.java | 109 +++- - .../minecraft/server/PathfinderNormal.java | 2 +- - .../net/minecraft/server/PlayerChunk.java | 37 +- - .../net/minecraft/server/PlayerChunkMap.java | 64 ++- - .../minecraft/server/PlayerConnection.java | 34 +- - .../server/PlayerConnectionUtils.java | 26 + - .../server/PlayerInteractManager.java | 53 +- - .../java/net/minecraft/server/ProtoChunk.java | 16 +- - .../java/net/minecraft/server/RegionFile.java | 466 +++++++++++++++- - .../minecraft/server/RegionFileBitSet.java | 26 +- - .../net/minecraft/server/RegionFileCache.java | 52 +- - .../server/RegionFileCompression.java | 7 +- - .../java/net/minecraft/server/Ticket.java | 11 +- - .../java/net/minecraft/server/TicketType.java | 3 +- - .../java/net/minecraft/server/TileEntity.java | 49 +- - .../minecraft/server/TileEntityBeacon.java | 26 +- - .../minecraft/server/TileEntityBeehive.java | 7 + - .../server/TileEntityBrewingStand.java | 26 +- - .../net/minecraft/server/TileEntityChest.java | 16 + - .../minecraft/server/TileEntityConduit.java | 21 +- - .../minecraft/server/TileEntityFurnace.java | 26 +- - .../minecraft/server/TileEntityJukeBox.java | 7 + - .../minecraft/server/TileEntityLectern.java | 51 +- - .../minecraft/server/TileEntityPiston.java | 66 ++- - src/main/java/net/minecraft/server/Vec3D.java | 5 +- - .../net/minecraft/server/VillagePlace.java | 2 +- - .../java/net/minecraft/server/VoxelShape.java | 11 +- - .../net/minecraft/server/VoxelShapeArray.java | 72 +++ - .../net/minecraft/server/VoxelShapes.java | 79 ++- - src/main/java/net/minecraft/server/World.java | 48 +- - .../net/minecraft/server/WorldBorder.java | 38 +- - .../net/minecraft/server/WorldServer.java | 517 +++++++++++++++++- - .../net/minecraft/server/WorldUpgrader.java | 2 +- - .../craftbukkit/CraftChunkSnapshot.java | 2 +- - .../org/bukkit/craftbukkit/CraftServer.java | 17 +- - .../org/bukkit/craftbukkit/CraftWorld.java | 19 +- - .../java/org/bukkit/craftbukkit/Main.java | 9 +- - .../bukkit/craftbukkit/block/CraftBlock.java | 21 +- - .../craftbukkit/block/CraftBlockState.java | 2 +- - .../block/data/CraftBlockData.java | 2 +- - .../craftbukkit/entity/CraftEntity.java | 31 ++ - .../craftbukkit/generator/CraftChunkData.java | 2 +- - .../scoreboard/CraftScoreboardManager.java | 9 + - .../bukkit/craftbukkit/util/UnsafeList.java | 26 + - .../bukkit/craftbukkit/util/Versioning.java | 2 +- - src/main/java/org/spigotmc/AsyncCatcher.java | 2 +- - .../java/org/spigotmc/WatchdogThread.java | 79 +++ - 85 files changed, 3960 insertions(+), 358 deletions(-) - create mode 100644 src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java - create mode 100644 src/main/java/com/tuinity/tuinity/config/TuinityConfig.java - create mode 100644 src/main/java/com/tuinity/tuinity/util/CachedLists.java - create mode 100644 src/main/java/com/tuinity/tuinity/util/TickThread.java - create mode 100644 src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java - create mode 100644 src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java diff --git a/pom.xml b/pom.xml index ef8ee637a..6fd596817 100644 @@ -3880,7 +3787,7 @@ index 8c5639fa5..4dd6f48ca 100644 // Paper end - optimised tracker diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index cf83059fe..c40255263 100644 +index cf83059fe..37f55c66b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -322,19 +322,24 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -3926,6 +3833,15 @@ index cf83059fe..c40255263 100644 this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity)); return; } +@@ -976,7 +983,7 @@ public class PlayerConnection implements PacketListenerPlayIn { + } + + if (this.teleportPos != null) { +- if (this.e - this.A > 20) { ++ if (false && this.e - this.A > 20) { // Tuinity - this will greatly screw with clients with > 1000ms RTT + this.A = this.e; + this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch); + } @@ -1000,7 +1007,7 @@ public class PlayerConnection implements PacketListenerPlayIn { double d2 = this.player.locZ(); double d3 = this.player.locY(); @@ -3958,6 +3874,23 @@ index cf83059fe..c40255263 100644 this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet()); return; } +@@ -1097,6 +1109,7 @@ public class PlayerConnection implements PacketListenerPlayIn { + } + + this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9)); ++ boolean didCollide = toX != this.player.locX() || toY != this.player.locY() || toZ != this.player.locZ(); // Tuinity - needed here as the difference in Y can be reset - also note: this is only a guess at whether collisions took place, floating point errors can make this true when it shouldn't be... + this.player.c(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move + // Paper start - prevent position desync + if (this.teleportPos != null) { +@@ -1121,7 +1134,7 @@ public class PlayerConnection implements PacketListenerPlayIn { + } + + this.player.setLocation(d4, d5, d6, f, f1); +- if (!this.player.noclip && !this.player.isSleeping() && (flag1 && worldserver.getCubes(this.player, axisalignedbb) || this.a((IWorldReader) worldserver, axisalignedbb))) { ++ if (!this.player.noclip && !this.player.isSleeping() && (flag1 && worldserver.getCubes(this.player, axisalignedbb) || (didCollide && this.a((IWorldReader) worldserver, axisalignedbb)))) { // Tuinity - optimise out the extra getCubes-like call most of the time + this.a(d0, d1, d2, f, f1); + } else { + // CraftBukkit start - fire PlayerMoveEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java index eb3269e0e..d9c9d01ae 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -7158,6 +7091,3 @@ index 513c1041c..4d3109084 100644 dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( server.serverThread.getId(), Integer.MAX_VALUE ), log ); log.log( Level.SEVERE, "------------------------------" ); // --- -2.26.2 - diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch index 28b6209b4..ec802a854 100644 --- a/patches/server/0002-Rebrand.patch +++ b/patches/server/0002-Rebrand.patch @@ -1,18 +1,8 @@ -From eecd43452be61d472ae36cbaf2a54f3fdd83a8f9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand ---- - pom.xml | 35 ++++-- - .../paper/console/PaperConsole.java | 2 +- - .../net/minecraft/server/MinecraftServer.java | 2 +- - .../net/pl3x/purpur/PurpurVersionFetcher.java | 115 ++++++++++++++++++ - .../org/bukkit/craftbukkit/CraftServer.java | 2 +- - .../craftbukkit/util/CraftMagicNumbers.java | 2 +- - .../bukkit/craftbukkit/util/Versioning.java | 2 +- - 7 files changed, 144 insertions(+), 16 deletions(-) - create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java diff --git a/pom.xml b/pom.xml index 6fd596817..285fa63b3 100644 @@ -281,6 +271,3 @@ index 001b1e519..13b984393 100644 Properties properties = new Properties(); if (stream != null) { --- -2.26.2 - diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index 59d0848cf..5ae969e60 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -1,21 +1,8 @@ -From 5b76af39666ae3487ad49feb5cd0a09f8838c05e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 18:09:43 -0500 Subject: [PATCH] Purpur config files ---- - .../java/com/destroystokyo/paper/Metrics.java | 7 +- - .../net/minecraft/server/DedicatedServer.java | 9 ++ - src/main/java/net/minecraft/server/World.java | 2 + - .../java/net/pl3x/purpur/PurpurConfig.java | 130 ++++++++++++++++++ - .../net/pl3x/purpur/PurpurWorldConfig.java | 59 ++++++++ - .../pl3x/purpur/command/PurpurCommand.java | 65 +++++++++ - .../org/bukkit/craftbukkit/CraftServer.java | 15 ++ - .../java/org/bukkit/craftbukkit/Main.java | 8 ++ - 8 files changed, 292 insertions(+), 3 deletions(-) - create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java - create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java - create mode 100644 src/main/java/net/pl3x/purpur/command/PurpurCommand.java diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java index 24641501a..78369e670 100644 @@ -420,6 +407,3 @@ index a216b1336..c1e7e6a45 100644 // Paper start acceptsAll(asList("server-name"), "Name of the server") .withRequiredArg() --- -2.26.2 - diff --git a/patches/server/0004-Timings-stuff.patch b/patches/server/0004-Timings-stuff.patch index d76de79db..1fee72106 100644 --- a/patches/server/0004-Timings-stuff.patch +++ b/patches/server/0004-Timings-stuff.patch @@ -1,11 +1,8 @@ -From bc659814e1291b1efc14e0b8c7940db3423008d6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jun 2020 21:30:19 -0500 Subject: [PATCH] Timings stuff ---- - .../java/co/aikar/timings/TimingsExport.java | 27 +++++++++++++++---- - 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java index 5dfa06588..dae2e5d70 100644 @@ -59,6 +56,3 @@ index 5dfa06588..dae2e5d70 100644 con.setDoOutput(true); String hostName = "BrokenHost"; try { --- -2.26.2 - diff --git a/patches/server/0005-Barrels-and-enderchests-6-rows.patch b/patches/server/0005-Barrels-and-enderchests-6-rows.patch index c45dd048c..497817630 100644 --- a/patches/server/0005-Barrels-and-enderchests-6-rows.patch +++ b/patches/server/0005-Barrels-and-enderchests-6-rows.patch @@ -1,16 +1,8 @@ -From 1bbb9cf5c61f902c0c65e8cdc41ae27b6c3fc9c6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 23 May 2019 21:50:37 -0500 Subject: [PATCH] Barrels and enderchests 6 rows ---- - .../net/minecraft/server/BlockEnderChest.java | 21 ++++++++++++++++ - .../minecraft/server/InventoryEnderChest.java | 2 +- - .../minecraft/server/TileEntityBarrel.java | 5 ++-- - .../java/net/pl3x/purpur/PurpurConfig.java | 25 +++++++++++++++++++ - .../craftbukkit/inventory/CraftContainer.java | 4 ++- - .../craftbukkit/inventory/CraftInventory.java | 2 +- - 6 files changed, 54 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java index af2819bb8..73ab299a4 100644 @@ -157,6 +149,3 @@ index 726631348..a45100034 100644 throw new IllegalArgumentException("Invalid inventory size; expected " + getSize() + " or less"); } --- -2.26.2 - diff --git a/patches/server/0006-Advancement-API.patch b/patches/server/0006-Advancement-API.patch index 18d8fc708..4bd3f1d16 100644 --- a/patches/server/0006-Advancement-API.patch +++ b/patches/server/0006-Advancement-API.patch @@ -1,17 +1,8 @@ -From f9e2498834beb19689a969fb82358791dead4355 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 31 May 2019 21:24:33 -0500 Subject: [PATCH] Advancement API ---- - .../net/minecraft/server/Advancement.java | 2 +- - .../minecraft/server/AdvancementDisplay.java | 12 ++++- - .../server/AdvancementFrameType.java | 15 +++++- - .../minecraft/server/CriterionTrigger.java | 1 + - .../advancement/CraftAdvancement.java | 7 +++ - .../advancement/CraftAdvancementDisplay.java | 47 +++++++++++++++++++ - 6 files changed, 79 insertions(+), 5 deletions(-) - create mode 100644 src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java index 315a03cf5..07d4c4cfd 100644 @@ -187,6 +178,3 @@ index 000000000..1cbb1e67b + return handle.isHidden(); + } +} --- -2.26.2 - diff --git a/patches/server/0007-Llama-API.patch b/patches/server/0007-Llama-API.patch index 541390d08..5440c30d4 100644 --- a/patches/server/0007-Llama-API.patch +++ b/patches/server/0007-Llama-API.patch @@ -1,13 +1,8 @@ -From 70dd31ae817bfcfb9e4b293673d48d009fcf73e1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 22:50:12 -0500 Subject: [PATCH] Llama API ---- - .../net/minecraft/server/EntityLlama.java | 18 ++++++-- - .../server/PathfinderGoalLlamaFollow.java | 4 +- - .../bukkit/craftbukkit/entity/CraftLlama.java | 44 +++++++++++++++++++ - 3 files changed, 61 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java index 4fe769c76..cf3192085 100644 @@ -161,6 +156,3 @@ index 3f94c5a92..a02763480 100644 + } + // Purpur end } --- -2.26.2 - diff --git a/patches/server/0008-Evoker-API.patch b/patches/server/0008-Evoker-API.patch index d6ddc00f9..1e98a3408 100644 --- a/patches/server/0008-Evoker-API.patch +++ b/patches/server/0008-Evoker-API.patch @@ -1,12 +1,8 @@ -From dfb25a8ebbc77cc96c5f8b3a7efb69c887e13669 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:29:02 -0500 Subject: [PATCH] Evoker API ---- - .../java/net/minecraft/server/EntityEvoker.java | 5 +++-- - .../bukkit/craftbukkit/entity/CraftEvoker.java | 17 +++++++++++++++++ - 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java index dd55e5e5b..c37c2930e 100644 @@ -69,6 +65,3 @@ index 0636d2647..a7a548421 100644 + } + // Purpur end } --- -2.26.2 - diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0009-AFK-API.patch index 853add19b..246f3e302 100644 --- a/patches/server/0009-AFK-API.patch +++ b/patches/server/0009-AFK-API.patch @@ -1,21 +1,8 @@ -From 861ae1057019a5d8827a2dda7809616009d012ef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 8 Aug 2019 15:29:15 -0500 Subject: [PATCH] AFK API ---- - .../java/net/minecraft/server/Entity.java | 1 + - .../net/minecraft/server/EntityHuman.java | 9 ++++ - .../net/minecraft/server/EntityPlayer.java | 46 +++++++++++++++++++ - .../net/minecraft/server/IEntityAccess.java | 34 +++++--------- - .../net/minecraft/server/IEntitySelector.java | 2 + - .../minecraft/server/PlayerConnection.java | 12 ++++- - .../net/minecraft/server/WorldServer.java | 4 +- - .../java/net/pl3x/purpur/PurpurConfig.java | 8 ++++ - .../net/pl3x/purpur/PurpurWorldConfig.java | 11 +++++ - .../craftbukkit/entity/CraftPlayer.java | 17 +++++++ - .../java/org/spigotmc/ActivationRange.java | 1 + - 11 files changed, 120 insertions(+), 25 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index f8ca56be8..3ba812843 100644 @@ -174,7 +161,7 @@ index a52dd0c02..9b4795f3b 100644 // Paper start public static final Predicate affectsSpawning = (entity) -> { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index c40255263..6be2c0192 100644 +index 37f55c66b..aa6855c35 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -232,6 +232,12 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -199,7 +186,7 @@ index c40255263..6be2c0192 100644 // Skip the first time we do this if (true) { // Spigot - don't skip any move events Location oldTo = to.clone(); -@@ -1129,7 +1137,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1130,7 +1138,7 @@ public class PlayerConnection implements PacketListenerPlayIn { if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot flag1 = true; @@ -208,7 +195,7 @@ index c40255263..6be2c0192 100644 } this.player.setLocation(d4, d5, d6, f, f1); -@@ -1168,6 +1176,8 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1169,6 +1177,8 @@ public class PlayerConnection implements PacketListenerPlayIn { this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -323,6 +310,3 @@ index f78e44e05..da4c49daf 100644 maxBB = player.getBoundingBox().grow( maxRange, 256, maxRange ); ActivationType.MISC.boundingBox = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange ); ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange ); --- -2.26.2 - diff --git a/patches/server/0010-Bring-back-server-name.patch b/patches/server/0010-Bring-back-server-name.patch index c58b60f62..ee5368eaa 100644 --- a/patches/server/0010-Bring-back-server-name.patch +++ b/patches/server/0010-Bring-back-server-name.patch @@ -1,12 +1,8 @@ -From 91814a6084e670f6fec1f0a3c07112a62b7dcbfd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 May 2019 15:19:14 -0500 Subject: [PATCH] Bring back server name ---- - .../net/minecraft/server/DedicatedServerProperties.java | 1 + - src/main/java/org/bukkit/craftbukkit/CraftServer.java | 7 +++++++ - 2 files changed, 8 insertions(+) diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java index 6786fd094..8a9be3fdb 100644 @@ -36,6 +32,3 @@ index efa1b59fa..b50a6eea3 100644 + } + // Purpur end } --- -2.26.2 - diff --git a/patches/server/0011-Configurable-server-mod-name.patch b/patches/server/0011-Configurable-server-mod-name.patch index cff7f1f07..e448c0f6b 100644 --- a/patches/server/0011-Configurable-server-mod-name.patch +++ b/patches/server/0011-Configurable-server-mod-name.patch @@ -1,12 +1,8 @@ -From a06e9db2cd0bedea59034541a472cb2d32d439f5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 21 Mar 2020 11:47:39 -0500 Subject: [PATCH] Configurable server mod name ---- - src/main/java/net/minecraft/server/MinecraftServer.java | 2 +- - src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index e23e47ee7..ba0260fa5 100644 @@ -37,6 +33,3 @@ index cc08ad33e..3d779b0dc 100644 public static String timingsUrl = "https://timings.pl3x.net"; private static void timingsSettings() { timingsUrl = getString("settings.timings.url", timingsUrl); --- -2.26.2 - diff --git a/patches/server/0012-LivingEntity-safeFallDistance.patch b/patches/server/0012-LivingEntity-safeFallDistance.patch index a322bc3c3..626bb8f88 100644 --- a/patches/server/0012-LivingEntity-safeFallDistance.patch +++ b/patches/server/0012-LivingEntity-safeFallDistance.patch @@ -1,14 +1,8 @@ -From 2ae8c1ce21cbcd4061616fbe7cbd2ff5550437b1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 May 2019 12:58:45 -0500 Subject: [PATCH] LivingEntity safeFallDistance ---- - .../java/net/minecraft/server/EntityGiantZombie.java | 1 + - .../net/minecraft/server/EntityHorseAbstract.java | 2 +- - src/main/java/net/minecraft/server/EntityLiving.java | 7 ++++--- - .../bukkit/craftbukkit/entity/CraftLivingEntity.java | 12 ++++++++++++ - 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java index 603fe5caa..37618126f 100644 @@ -88,6 +82,3 @@ index 3777aba5f..2a82a2bb7 100644 + } + // Purpur end } --- -2.26.2 - diff --git a/patches/server/0013-MoonPhase-API.patch b/patches/server/0013-MoonPhase-API.patch index 302a2ab78..e5a8f4adb 100644 --- a/patches/server/0013-MoonPhase-API.patch +++ b/patches/server/0013-MoonPhase-API.patch @@ -1,11 +1,8 @@ -From a30746c5569efc03352fc4fbb82c0a76545ab483 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 1 Feb 2020 22:22:16 -0600 Subject: [PATCH] MoonPhase API ---- - src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 7 +++++++ - 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 21bd9f14e..0c721a5fd 100644 @@ -23,6 +20,3 @@ index 21bd9f14e..0c721a5fd 100644 + } + // Purpur end } --- -2.26.2 - diff --git a/patches/server/0014-Lagging-threshold.patch b/patches/server/0014-Lagging-threshold.patch index db83add71..fecadcbd4 100644 --- a/patches/server/0014-Lagging-threshold.patch +++ b/patches/server/0014-Lagging-threshold.patch @@ -1,13 +1,8 @@ -From d256e1dc2312caab32b822712bd426e35d087581 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 10:07:16 -0500 Subject: [PATCH] Lagging threshold ---- - src/main/java/net/minecraft/server/MinecraftServer.java | 2 ++ - src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ - src/main/java/org/bukkit/craftbukkit/CraftServer.java | 5 +++++ - 3 files changed, 12 insertions(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index ba0260fa5..8ed47fe05 100644 @@ -60,6 +55,3 @@ index b50a6eea3..44e416501 100644 + } // Purpur end } --- -2.26.2 - diff --git a/patches/server/0015-ItemFactory-getMonsterEgg.patch b/patches/server/0015-ItemFactory-getMonsterEgg.patch index ab6cb8cdd..adbe7fa8e 100644 --- a/patches/server/0015-ItemFactory-getMonsterEgg.patch +++ b/patches/server/0015-ItemFactory-getMonsterEgg.patch @@ -1,12 +1,8 @@ -From 40ac51e22d65abd4574d247ecad7d26cea9a2e08 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jul 2019 16:36:55 -0500 Subject: [PATCH] ItemFactory#getMonsterEgg ---- - .../java/net/minecraft/server/ItemMonsterEgg.java | 2 +- - .../craftbukkit/inventory/CraftItemFactory.java | 14 ++++++++++++++ - 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java index 6d8321080..793e42072 100644 @@ -44,6 +40,3 @@ index c28691ae6..616c3e8e4 100644 + } + // Purpur end } --- -2.26.2 - diff --git a/patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch index 816b6b0c1..ef07a7981 100644 --- a/patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch +++ b/patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch @@ -1,12 +1,8 @@ -From 8ed07ea5498704c7c2228ba4d45cdafcb7ef8c14 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jul 2019 18:21:00 -0500 Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent ---- - .../net/minecraft/server/EntityTypes.java | 22 +++++++++++++++++++ - .../net/minecraft/server/ItemMonsterEgg.java | 16 ++++++++++++++ - 2 files changed, 38 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java index 18a806ebb..7f2dcc1de 100644 @@ -93,6 +89,3 @@ index 793e42072..cf4c12ff8 100644 mobspawnerabstract.setMobName(entitytypes); tileentity.update(); world.notify(blockposition, iblockdata, iblockdata, 3); --- -2.26.2 - diff --git a/patches/server/0017-EMC-MonsterEggSpawnEvent.patch b/patches/server/0017-EMC-MonsterEggSpawnEvent.patch index 46925b751..8cac1f14e 100644 --- a/patches/server/0017-EMC-MonsterEggSpawnEvent.patch +++ b/patches/server/0017-EMC-MonsterEggSpawnEvent.patch @@ -1,11 +1,8 @@ -From 1a08ed0d95f59a8c98d8d06a6b01264c4a343cdd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 20 Jul 2013 22:40:56 -0400 Subject: [PATCH] EMC - MonsterEggSpawnEvent ---- - .../net/minecraft/server/EntityTypes.java | 28 ++++++++++++++++++- - 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java index 7f2dcc1de..5aea85595 100644 @@ -58,6 +55,3 @@ index 7f2dcc1de..5aea85595 100644 return world.addEntity(t0, spawnReason) ? t0 : null; // Don't return an entity when CreatureSpawnEvent is canceled // CraftBukkit end } --- -2.26.2 - diff --git a/patches/server/0018-Villager-resetOffers.patch b/patches/server/0018-Villager-resetOffers.patch index 31926b8ef..c01273984 100644 --- a/patches/server/0018-Villager-resetOffers.patch +++ b/patches/server/0018-Villager-resetOffers.patch @@ -1,12 +1,8 @@ -From 21fe0113b78ebd98f56eba3feb429e3b0cc8e240 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 7 Oct 2019 00:15:37 -0500 Subject: [PATCH] Villager#resetOffers ---- - .../java/net/minecraft/server/EntityVillagerAbstract.java | 8 ++++++++ - .../java/org/bukkit/craftbukkit/entity/CraftVillager.java | 7 +++++++ - 2 files changed, 15 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java index 81823b5d5..beb84a2ab 100644 @@ -50,6 +46,3 @@ index d24a892c4..abfa6340f 100644 + } + // Purpur end } --- -2.26.2 - diff --git a/patches/server/0019-World-getPlacementBlockData.patch b/patches/server/0019-World-getPlacementBlockData.patch index cd7ecef4f..c8d14b9fd 100644 --- a/patches/server/0019-World-getPlacementBlockData.patch +++ b/patches/server/0019-World-getPlacementBlockData.patch @@ -1,11 +1,8 @@ -From b149fadd0450fc4ebca351978f38c5457a12a82a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 8 Feb 2020 23:30:17 -0600 Subject: [PATCH] World#getPlacementBlockData ---- - src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 5 +++++ - 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 0c721a5fd..a9dfd40f1 100644 @@ -22,6 +19,3 @@ index 0c721a5fd..a9dfd40f1 100644 + } // Purpur end } --- -2.26.2 - diff --git a/patches/server/0020-LivingEntity-playPickupItemAnimation.patch b/patches/server/0020-LivingEntity-playPickupItemAnimation.patch index c78a5dea8..7b99a1a7c 100644 --- a/patches/server/0020-LivingEntity-playPickupItemAnimation.patch +++ b/patches/server/0020-LivingEntity-playPickupItemAnimation.patch @@ -1,11 +1,8 @@ -From 53cdbac2ff0413c6af832bd4e331c3c8968a6afa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:25:16 -0500 Subject: [PATCH] LivingEntity#playPickupItemAnimation ---- - .../org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 5 +++++ - 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index 2a82a2bb7..a415707e9 100644 @@ -22,6 +19,3 @@ index 2a82a2bb7..a415707e9 100644 + } // Purpur end } --- -2.26.2 - diff --git a/patches/server/0021-SkeletonHorseTrapEvent-getPlayer.patch b/patches/server/0021-SkeletonHorseTrapEvent-getPlayer.patch index 2305a9602..0c34b60ac 100644 --- a/patches/server/0021-SkeletonHorseTrapEvent-getPlayer.patch +++ b/patches/server/0021-SkeletonHorseTrapEvent-getPlayer.patch @@ -1,11 +1,8 @@ -From f607a151862c8aff8bb765024f5b408197d90f1a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:35:35 -0500 Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer ---- - .../java/net/minecraft/server/PathfinderGoalHorseTrap.java | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java index b37e4aa37..4d8c4ac07 100644 @@ -36,6 +33,3 @@ index b37e4aa37..4d8c4ac07 100644 DifficultyDamageScaler difficultydamagescaler = this.a.world.getDamageScaler(this.a.getChunkCoordinates()); this.a.t(false); --- -2.26.2 - diff --git a/patches/server/0022-PaperPR-PlayerItemCooldownEvent.patch b/patches/server/0022-PaperPR-PlayerItemCooldownEvent.patch index ae3ab265b..32f068046 100644 --- a/patches/server/0022-PaperPR-PlayerItemCooldownEvent.patch +++ b/patches/server/0022-PaperPR-PlayerItemCooldownEvent.patch @@ -1,11 +1,8 @@ -From 453a7d6a6b56ff2546deef9f69f7d72dd013ce66 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Mon, 20 Apr 2020 13:57:06 +0200 Subject: [PATCH] PaperPR - PlayerItemCooldownEvent ---- - .../net/minecraft/server/ItemCooldownPlayer.java | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java index 27cde8c15..3c3bcc7f9 100644 @@ -36,6 +33,3 @@ index 27cde8c15..3c3bcc7f9 100644 @Override protected void b(Item item, int i) { super.b(item, i); --- -2.26.2 - diff --git a/patches/server/0023-EntityMoveEvent.patch b/patches/server/0023-EntityMoveEvent.patch index 3fb19df98..5bc7ba402 100644 --- a/patches/server/0023-EntityMoveEvent.patch +++ b/patches/server/0023-EntityMoveEvent.patch @@ -1,11 +1,8 @@ -From 0106f4613bfbb72f454d45b0da08a6f32be00744 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 11 Feb 2020 21:56:48 -0600 Subject: [PATCH] EntityMoveEvent ---- - .../java/net/minecraft/server/EntityLiving.java | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index ceeb0c4c1..a5262b88e 100644 @@ -32,6 +29,3 @@ index ceeb0c4c1..a5262b88e 100644 if (!this.world.isClientSide && this.dN() && this.aC()) { this.damageEntity(DamageSource.DROWN, 1.0F); } --- -2.26.2 - diff --git a/patches/server/0024-PaperPR-Add-BellRingEvent.patch b/patches/server/0024-PaperPR-Add-BellRingEvent.patch index e22dc330e..2e31d0b54 100644 --- a/patches/server/0024-PaperPR-Add-BellRingEvent.patch +++ b/patches/server/0024-PaperPR-Add-BellRingEvent.patch @@ -1,11 +1,8 @@ -From 8616ee18ee7da78b892222532f3b42d62e94d89d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Eearslya Sleiarion Date: Mon, 24 Jun 2019 21:27:32 -0700 Subject: [PATCH] PaperPR - Add BellRingEvent ---- - src/main/java/net/minecraft/server/BlockBell.java | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/BlockBell.java b/src/main/java/net/minecraft/server/BlockBell.java index 2ef899c76..7db4e22c6 100644 @@ -44,6 +41,3 @@ index 2ef899c76..7db4e22c6 100644 boolean flag2 = this.a(world, blockposition, enumdirection); if (flag2 && entityhuman != null) { --- -2.26.2 - diff --git a/patches/server/0025-Player-invulnerabilities.patch b/patches/server/0025-Player-invulnerabilities.patch index 6a71b250a..044f07acd 100644 --- a/patches/server/0025-Player-invulnerabilities.patch +++ b/patches/server/0025-Player-invulnerabilities.patch @@ -1,15 +1,8 @@ -From 782c29bce0fea7efdaf48b9c1f23a6258a694fd2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 2 May 2020 20:55:44 -0500 Subject: [PATCH] Player invulnerabilities ---- - .../net/minecraft/server/EntityPlayer.java | 21 +++++++++++++++++-- - .../minecraft/server/PlayerConnection.java | 1 + - .../java/net/minecraft/server/PlayerList.java | 2 ++ - .../net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++ - .../craftbukkit/entity/CraftPlayer.java | 15 +++++++++++++ - 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 508a91418..07f8f0fa7 100644 @@ -74,10 +67,10 @@ index 508a91418..07f8f0fa7 100644 public Scoreboard getScoreboard() { return getBukkitEntity().getScoreboard().getHandle(); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6be2c0192..e08143623 100644 +index aa6855c35..a7ace9034 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1575,6 +1575,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1576,6 +1576,7 @@ public class PlayerConnection implements PacketListenerPlayIn { PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer()); // Paper start PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()]; @@ -139,6 +132,3 @@ index e8c8ba74b..14a5a4072 100644 + } // Purpur end } --- -2.26.2 - diff --git a/patches/server/0026-Anvil-API.patch b/patches/server/0026-Anvil-API.patch index cfe4e0c87..7e3a69cec 100644 --- a/patches/server/0026-Anvil-API.patch +++ b/patches/server/0026-Anvil-API.patch @@ -1,12 +1,8 @@ -From 55ca7128b336a2f50ca8c71e7c34ef4765ecee60 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 19 Apr 2020 00:17:56 -0500 Subject: [PATCH] Anvil API ---- - .../net/minecraft/server/ContainerAnvil.java | 29 +++++++++++++++++-- - .../inventory/CraftInventoryAnvil.java | 24 ++++++++++++++- - 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java index 24631b2bc..126effe5b 100644 @@ -135,6 +131,3 @@ index 9374c2706..d45f356be 100644 + } + // Purpur end } --- -2.26.2 - diff --git a/patches/server/0027-Configurable-villager-brain-ticks.patch b/patches/server/0027-Configurable-villager-brain-ticks.patch index c3f890bdb..7040f6da4 100644 --- a/patches/server/0027-Configurable-villager-brain-ticks.patch +++ b/patches/server/0027-Configurable-villager-brain-ticks.patch @@ -1,12 +1,8 @@ -From 68f62757b17a41d8e4158acc3d3ece8e3bb3d590 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 08:28:21 -0500 Subject: [PATCH] Configurable villager brain ticks ---- - src/main/java/net/minecraft/server/EntityVillager.java | 6 ++++++ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++ - 2 files changed, 13 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java index bf019043a..7925c8991 100644 @@ -40,7 +36,7 @@ index bf019043a..7925c8991 100644 if (this.bM) { this.bM = false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1c9393f28..644501d5e 100644 +index c441fcea9..c7fb5a737 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -74,4 +74,11 @@ public class PurpurWorldConfig { @@ -55,6 +51,3 @@ index 1c9393f28..644501d5e 100644 + villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging); + } } --- -2.26.2 - diff --git a/patches/server/0028-Alternative-Keepalive-Handling.patch b/patches/server/0028-Alternative-Keepalive-Handling.patch index 08c8f942b..28934caf9 100644 --- a/patches/server/0028-Alternative-Keepalive-Handling.patch +++ b/patches/server/0028-Alternative-Keepalive-Handling.patch @@ -1,13 +1,8 @@ -From 76fe7d6818cac45ef64e56665e4a57122c920e85 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 11 Oct 2019 00:17:39 -0500 Subject: [PATCH] Alternative Keepalive Handling ---- - .../server/PacketPlayInKeepAlive.java | 1 + - .../minecraft/server/PlayerConnection.java | 26 +++++++++++++++++++ - .../java/net/pl3x/purpur/PurpurConfig.java | 5 ++++ - 3 files changed, 32 insertions(+) diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java index 8e93f1540..470f92c4f 100644 @@ -22,7 +17,7 @@ index 8e93f1540..470f92c4f 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e08143623..36519882f 100644 +index a7ace9034..bbe56cefe 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -55,7 +50,7 @@ index e08143623..36519882f 100644 if (this.isPendingPing()) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info -@@ -2716,6 +2732,16 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2717,6 +2733,16 @@ public class PlayerConnection implements PacketListenerPlayIn { @Override public void a(PacketPlayInKeepAlive packetplayinkeepalive) { @@ -88,6 +83,3 @@ index d8b826f6b..571917ffa 100644 public static boolean barrelSixRows = false; public static boolean enderChestSixRows = false; public static boolean enderChestPermissionRows = false; --- -2.26.2 - diff --git a/patches/server/0029-Silk-touch-spawners.patch b/patches/server/0029-Silk-touch-spawners.patch index cf72cbbaf..48b4e87b3 100644 --- a/patches/server/0029-Silk-touch-spawners.patch +++ b/patches/server/0029-Silk-touch-spawners.patch @@ -1,16 +1,8 @@ -From f49cd2fcfc97aa16866e036a2b7064c37851d6f0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 14:27:37 -0500 Subject: [PATCH] Silk touch spawners ---- - src/main/java/net/minecraft/server/Block.java | 1 + - .../net/minecraft/server/BlockMobSpawner.java | 35 +++++++++++++++++++ - .../net/minecraft/server/ItemSpawner.java | 23 ++++++++++++ - src/main/java/net/minecraft/server/Items.java | 2 +- - .../net/pl3x/purpur/PurpurWorldConfig.java | 22 ++++++++++++ - 5 files changed, 82 insertions(+), 1 deletion(-) - create mode 100644 src/main/java/net/minecraft/server/ItemSpawner.java diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java index 81725611d..c7232047c 100644 @@ -159,6 +151,3 @@ index c7fb5a737..818c4da17 100644 public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; private void villagerSettings() { --- -2.26.2 - diff --git a/patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch b/patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch index bf6a780fc..e55c995d2 100644 --- a/patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch +++ b/patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch @@ -1,11 +1,8 @@ -From 2d463d700f0ef3f803f4590b246f38371bcd21cb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 21 Feb 2020 17:04:51 -0600 Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter ---- - src/main/java/net/minecraft/server/EntityArrow.java | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java index 6195a45e3..ffa5ed69c 100644 @@ -34,6 +31,3 @@ index 6195a45e3..ffa5ed69c 100644 protected void h() { ++this.despawnCounter; if (this.despawnCounter >= (fromPlayer == PickupStatus.CREATIVE_ONLY ? world.paperConfig.creativeArrowDespawnRate : (fromPlayer == PickupStatus.DISALLOWED ? world.paperConfig.nonPlayerArrowDespawnRate : ((this instanceof EntityThrownTrident) ? world.spigotConfig.tridentDespawnRate : world.spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - TODO: Extract this to init? --- -2.26.2 - diff --git a/patches/server/0031-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0031-MC-168772-Fix-Add-turtle-egg-block-options.patch index 9e01b0314..74d3c8ae9 100644 --- a/patches/server/0031-MC-168772-Fix-Add-turtle-egg-block-options.patch +++ b/patches/server/0031-MC-168772-Fix-Add-turtle-egg-block-options.patch @@ -1,12 +1,8 @@ -From a6b04cf596d49adc0ef0c5462069a563dd0fe8f1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 22:15:46 -0500 Subject: [PATCH] MC-168772 Fix - Add turtle egg block options ---- - .../net/minecraft/server/BlockTurtleEgg.java | 19 ++++++++++++++++++- - .../net/pl3x/purpur/PurpurWorldConfig.java | 9 +++++++++ - 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java index 553c8affa..92cca6c44 100644 @@ -57,6 +53,3 @@ index 818c4da17..88e271574 100644 public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; private void villagerSettings() { --- -2.26.2 - diff --git a/patches/server/0032-MC-4-Fix-Item-position-desync.patch b/patches/server/0032-MC-4-Fix-Item-position-desync.patch index 0f8019fa9..a1d3b1a70 100644 --- a/patches/server/0032-MC-4-Fix-Item-position-desync.patch +++ b/patches/server/0032-MC-4-Fix-Item-position-desync.patch @@ -1,13 +1,8 @@ -From 9a719380dd77d81f543106abbe3a8f12ad72f054 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 6 Jul 2019 21:12:58 -0500 Subject: [PATCH] MC-4 Fix - Item position desync ---- - src/main/java/net/minecraft/server/EntityTrackerEntry.java | 6 ++++++ - src/main/java/net/minecraft/server/PacketPlayOutEntity.java | 2 ++ - src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ - 3 files changed, 13 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java index bfb931268..e9bc546f8 100644 @@ -57,6 +52,3 @@ index 571917ffa..4ac6fa44b 100644 + fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); + } } --- -2.26.2 - diff --git a/patches/server/0033-Fix-vanilla-command-permission-handler.patch b/patches/server/0033-Fix-vanilla-command-permission-handler.patch index eac8cf5f2..2d400eec5 100644 --- a/patches/server/0033-Fix-vanilla-command-permission-handler.patch +++ b/patches/server/0033-Fix-vanilla-command-permission-handler.patch @@ -1,12 +1,8 @@ -From b51bda6626891e402696410e1077c0246ab3de3e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 28 Mar 2020 01:51:32 -0500 Subject: [PATCH] Fix vanilla command permission handler ---- - src/main/java/com/mojang/brigadier/tree/CommandNode.java | 1 + - .../org/bukkit/craftbukkit/command/VanillaCommandWrapper.java | 1 + - 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java index 5e3fc338b..b3835c3c7 100644 @@ -32,6 +28,3 @@ index f34461460..8d89e671e 100644 return "minecraft.command." + ((vanillaCommand.getRedirect() == null) ? vanillaCommand.getName() : vanillaCommand.getRedirect().getName()); } --- -2.26.2 - diff --git a/patches/server/0034-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0034-Logger-settings-suppressing-pointless-logs.patch index 7cbd5889b..b39953c67 100644 --- a/patches/server/0034-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0034-Logger-settings-suppressing-pointless-logs.patch @@ -1,13 +1,8 @@ -From 8801394ee2cd8754cf1d766b26a228910d1eea42 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:52:12 -0500 Subject: [PATCH] Logger settings (suppressing pointless logs) ---- - .../java/net/minecraft/server/AdvancementDataPlayer.java | 1 + - src/main/java/net/pl3x/purpur/PurpurConfig.java | 7 +++++++ - .../java/org/bukkit/craftbukkit/legacy/CraftLegacy.java | 1 + - 3 files changed, 9 insertions(+) diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java index 57b9d1344..c89e843e2 100644 @@ -49,6 +44,3 @@ index b14333ce9..d25204f7d 100644 System.err.println("Initializing Legacy Material Support. Unless you have legacy plugins and/or data this is a bug!"); if (MinecraftServer.getServer() != null && MinecraftServer.getServer().isDebugging()) { new Exception().printStackTrace(); --- -2.26.2 - diff --git a/patches/server/0035-Disable-outdated-build-check.patch b/patches/server/0035-Disable-outdated-build-check.patch index dea527903..68eeeb9a1 100644 --- a/patches/server/0035-Disable-outdated-build-check.patch +++ b/patches/server/0035-Disable-outdated-build-check.patch @@ -1,11 +1,8 @@ -From c845120751b71ba6c9121c9c1c54cdf9ff4851c1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 15 Dec 2019 12:53:59 -0600 Subject: [PATCH] Disable outdated build check ---- - src/main/java/org/bukkit/craftbukkit/Main.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java index c1e7e6a45..38a982d3f 100644 @@ -20,6 +17,3 @@ index c1e7e6a45..38a982d3f 100644 Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper Calendar deadline = Calendar.getInstance(); --- -2.26.2 - diff --git a/patches/server/0036-Giants-AI-settings.patch b/patches/server/0036-Giants-AI-settings.patch index 70387b19a..5783e1ded 100644 --- a/patches/server/0036-Giants-AI-settings.patch +++ b/patches/server/0036-Giants-AI-settings.patch @@ -1,16 +1,8 @@ -From 8c6e31aad5ddf16ee331bb670740abb2a83aaf8d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 May 2019 00:43:12 -0500 Subject: [PATCH] Giants AI settings ---- - .../minecraft/server/AttributeMapBase.java | 1 + - .../java/net/minecraft/server/Entity.java | 2 +- - .../minecraft/server/EntityGiantZombie.java | 63 ++++++++++++++++++- - .../minecraft/server/EntityInsentient.java | 6 +- - .../net/minecraft/server/EntityLiving.java | 2 +- - .../net/pl3x/purpur/PurpurWorldConfig.java | 17 +++++ - 6 files changed, 86 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/AttributeMapBase.java b/src/main/java/net/minecraft/server/AttributeMapBase.java index c57e23e16..92aa104dc 100644 @@ -192,6 +184,3 @@ index 88e271574..b1aca6526 100644 public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; private void villagerSettings() { --- -2.26.2 - diff --git a/patches/server/0037-Illusioners-AI-settings.patch b/patches/server/0037-Illusioners-AI-settings.patch index 6825bb117..2973f2f07 100644 --- a/patches/server/0037-Illusioners-AI-settings.patch +++ b/patches/server/0037-Illusioners-AI-settings.patch @@ -1,12 +1,8 @@ -From 26de45c692600db72207e75ebd311b25a22fcede Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jul 2019 11:09:25 -0500 Subject: [PATCH] Illusioners AI settings ---- - .../net/minecraft/server/EntityIllagerIllusioner.java | 11 +++++++++++ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 9 +++++++++ - 2 files changed, 20 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java index 76fd0513f..1a5b9a0f0 100644 @@ -50,6 +46,3 @@ index b1aca6526..70f8feffb 100644 public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; private void villagerSettings() { --- -2.26.2 - diff --git a/patches/server/0038-Zombie-horse-naturally-spawn.patch b/patches/server/0038-Zombie-horse-naturally-spawn.patch index 9f5ee7a53..3501cc4c5 100644 --- a/patches/server/0038-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0038-Zombie-horse-naturally-spawn.patch @@ -1,12 +1,8 @@ -From 8c1e548d96e6e9553e0b70b9a4d516bf25610f3c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 7 Jul 2019 19:52:16 -0500 Subject: [PATCH] Zombie horse naturally spawn ---- - .../java/net/minecraft/server/WorldServer.java | 18 ++++++++++++------ - .../net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index 578cc6888..ee95ed6fa 100644 @@ -51,6 +47,3 @@ index 70f8feffb..d0fd8f9cd 100644 + zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance); + } } --- -2.26.2 - diff --git a/patches/server/0039-Charged-creeper-naturally-spawn.patch b/patches/server/0039-Charged-creeper-naturally-spawn.patch index e558333d3..747ad63cc 100644 --- a/patches/server/0039-Charged-creeper-naturally-spawn.patch +++ b/patches/server/0039-Charged-creeper-naturally-spawn.patch @@ -1,12 +1,8 @@ -From 36d9437ced879274d76a2b22d55b86d243afc227 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 22:37:44 -0600 Subject: [PATCH] Charged creeper naturally spawn ---- - src/main/java/net/minecraft/server/EntityCreeper.java | 11 +++++++++++ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 2 files changed, 16 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java index 5e7f3af37..ec5287fa5 100644 @@ -44,6 +40,3 @@ index d0fd8f9cd..5004d6f77 100644 public float giantStepHeight = 2.0F; public float giantJumpHeight = 1.0F; public double giantMaxHealth = 100.0D; --- -2.26.2 - diff --git a/patches/server/0040-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0040-Rabbit-naturally-spawn-toast-and-killer.patch index 6aaa332e2..158c18d5b 100644 --- a/patches/server/0040-Rabbit-naturally-spawn-toast-and-killer.patch +++ b/patches/server/0040-Rabbit-naturally-spawn-toast-and-killer.patch @@ -1,12 +1,8 @@ -From 80ed95c455ffb5ff67c051f6ea99fd56dec735d9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 31 Aug 2019 17:47:11 -0500 Subject: [PATCH] Rabbit naturally spawn toast and killer ---- - .../java/net/minecraft/server/EntityRabbit.java | 14 ++++++++++++++ - .../java/net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++ - 2 files changed, 21 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java index 00c9233f8..1be0f943b 100644 @@ -58,6 +54,3 @@ index 5004d6f77..52e459002 100644 public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; private void villagerSettings() { --- -2.26.2 - diff --git a/patches/server/0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch index 30342298e..d85ca6835 100644 --- a/patches/server/0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch +++ b/patches/server/0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch @@ -1,12 +1,9 @@ -From 367816c82ec5388b8cbdd72dcf6912900e66cfb2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 4 Jun 2019 15:50:08 -0500 Subject: [PATCH] Fix 'outdated server' showing in ping before server fully boots ---- - src/main/java/net/minecraft/server/PacketStatusListener.java | 1 + - 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java index 9beb6fad2..b98d09442 100644 @@ -20,6 +17,3 @@ index 9beb6fad2..b98d09442 100644 com.destroystokyo.paper.network.StandardPaperServerListPingEventImpl.processRequest(this.minecraftServer, this.networkManager); // Paper end } --- -2.26.2 - diff --git a/patches/server/0042-Make-Iron-Golems-Swim.patch b/patches/server/0042-Make-Iron-Golems-Swim.patch index e1b18d639..7495f975b 100644 --- a/patches/server/0042-Make-Iron-Golems-Swim.patch +++ b/patches/server/0042-Make-Iron-Golems-Swim.patch @@ -1,12 +1,8 @@ -From 896752031746a5db598819c8ee826c8b53fe0759 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 15 Jun 2019 03:12:15 -0500 Subject: [PATCH] Make Iron Golems Swim ---- - src/main/java/net/minecraft/server/EntityIronGolem.java | 1 + - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 2 files changed, 6 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java index e38a675be..ab0731c2a 100644 @@ -36,6 +32,3 @@ index 52e459002..1bee83e61 100644 public double rabbitNaturalToast = 0.0D; public double rabbitNaturalKiller = 0.0D; private void rabbitSettings() { --- -2.26.2 - diff --git a/patches/server/0043-Dont-send-useless-entity-packets.patch b/patches/server/0043-Dont-send-useless-entity-packets.patch index 5d6218b60..0aeab8d66 100644 --- a/patches/server/0043-Dont-send-useless-entity-packets.patch +++ b/patches/server/0043-Dont-send-useless-entity-packets.patch @@ -1,13 +1,8 @@ -From 0021421d337cbafb7fbc00cf55e838ce532b9cce Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 6 Jul 2019 17:00:04 -0500 Subject: [PATCH] Dont send useless entity packets ---- - .../minecraft/server/EntityTrackerEntry.java | 17 +++++++++++++++++ - .../minecraft/server/PacketPlayOutEntity.java | 10 +++++----- - src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ - 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java index e9bc546f8..c28e67f9b 100644 @@ -81,6 +76,3 @@ index b520cd28b..e8a0438ec 100644 public static boolean fixItemPositionDesync = false; private static void fixItemPositionDesync() { fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); --- -2.26.2 - diff --git a/patches/server/0044-Tulips-change-fox-type.patch b/patches/server/0044-Tulips-change-fox-type.patch index f664c8a5f..911f2de1d 100644 --- a/patches/server/0044-Tulips-change-fox-type.patch +++ b/patches/server/0044-Tulips-change-fox-type.patch @@ -1,13 +1,8 @@ -From d49265ee574818b3fce96fc7e53995e067a8792f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 13 Jul 2019 15:56:22 -0500 Subject: [PATCH] Tulips change fox type ---- - .../java/net/minecraft/server/EntityFox.java | 33 +++++++++++++++++-- - src/main/java/net/minecraft/server/Items.java | 4 +-- - .../net/pl3x/purpur/PurpurWorldConfig.java | 5 +++ - 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java index e6275a9fe..90b01adbe 100644 @@ -105,6 +100,3 @@ index 1bee83e61..a98dd59b8 100644 public float giantStepHeight = 2.0F; public float giantJumpHeight = 1.0F; public double giantMaxHealth = 100.0D; --- -2.26.2 - diff --git a/patches/server/0045-Breedable-Polar-Bears.patch b/patches/server/0045-Breedable-Polar-Bears.patch index f6bd3a762..b78743c4e 100644 --- a/patches/server/0045-Breedable-Polar-Bears.patch +++ b/patches/server/0045-Breedable-Polar-Bears.patch @@ -1,12 +1,8 @@ -From adcf39bd138599c2b8c804ff0d6df9a4127fc617 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 19:46:44 -0500 Subject: [PATCH] Breedable Polar Bears ---- - .../net/minecraft/server/EntityPolarBear.java | 34 ++++++++++++++++++- - .../net/pl3x/purpur/PurpurWorldConfig.java | 8 +++++ - 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java index 69e5c1aed..6506e0055 100644 @@ -91,6 +87,3 @@ index a98dd59b8..9b6bd8f41 100644 public double rabbitNaturalToast = 0.0D; public double rabbitNaturalKiller = 0.0D; private void rabbitSettings() { --- -2.26.2 - diff --git a/patches/server/0046-Chickens-can-retaliate.patch b/patches/server/0046-Chickens-can-retaliate.patch index 58db24571..773625a24 100644 --- a/patches/server/0046-Chickens-can-retaliate.patch +++ b/patches/server/0046-Chickens-can-retaliate.patch @@ -1,12 +1,8 @@ -From 0a138415bb88a6c54042d0b0fd22d3128cc4f4fc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 Apr 2020 13:19:34 -0500 Subject: [PATCH] Chickens can retaliate ---- - .../net/minecraft/server/EntityChicken.java | 23 +++++++++++++++++-- - .../net/pl3x/purpur/PurpurWorldConfig.java | 5 ++++ - 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java index c6ee92343..fa97552bb 100644 @@ -72,6 +68,3 @@ index 9b6bd8f41..06d9d9ed4 100644 public double creeperChargedChance = 0.0D; private void creeperSettings() { creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance); --- -2.26.2 - diff --git a/patches/server/0047-Add-option-to-set-armorstand-step-height.patch b/patches/server/0047-Add-option-to-set-armorstand-step-height.patch index a716f2499..7857e529a 100644 --- a/patches/server/0047-Add-option-to-set-armorstand-step-height.patch +++ b/patches/server/0047-Add-option-to-set-armorstand-step-height.patch @@ -1,12 +1,8 @@ -From ced6e8afca35db154d628d4c700f5c943dcb5299 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 6 Oct 2019 12:46:35 -0500 Subject: [PATCH] Add option to set armorstand step height ---- - src/main/java/net/minecraft/server/EntityArmorStand.java | 1 + - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 2 files changed, 6 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java index 250bccee4..7543f2cee 100644 @@ -21,7 +17,7 @@ index 250bccee4..7543f2cee 100644 if (!this.canTick) { if (this.noTickPoseDirty) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 46bf6bcd8..4ab4c4cd6 100644 +index 06d9d9ed4..b41d4959c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -63,6 +63,11 @@ public class PurpurWorldConfig { @@ -36,6 +32,3 @@ index 46bf6bcd8..4ab4c4cd6 100644 public boolean idleTimeoutKick = true; public boolean idleTimeoutTickNearbyEntities = true; public boolean idleTimeoutCountAsSleeping = false; --- -2.26.2 - diff --git a/patches/server/0048-Cat-spawning-options.patch b/patches/server/0048-Cat-spawning-options.patch index ca9dcea77..3810af3ff 100644 --- a/patches/server/0048-Cat-spawning-options.patch +++ b/patches/server/0048-Cat-spawning-options.patch @@ -1,16 +1,8 @@ -From 28836c3c83dabf35398ee624855ceed85b0da776 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Dec 2019 18:52:55 -0600 Subject: [PATCH] Cat spawning options ---- - .../net/minecraft/server/IEntityAccess.java | 1 + - .../net/minecraft/server/MobSpawnerCat.java | 24 ++++++++++++------- - .../net/minecraft/server/VillagePlace.java | 1 + - .../minecraft/server/VillagePlaceType.java | 3 ++- - .../net/minecraft/server/WorldServer.java | 1 + - .../net/pl3x/purpur/PurpurWorldConfig.java | 9 +++++++ - 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java index dfa8f3439..a3a073f9d 100644 @@ -138,6 +130,3 @@ index b41d4959c..55e609cc1 100644 public boolean chickenRetaliate = false; private void chickenSettings() { chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate); --- -2.26.2 - diff --git a/patches/server/0049-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0049-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch index ec75ea1af..3316977c3 100644 --- a/patches/server/0049-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch +++ b/patches/server/0049-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch @@ -1,11 +1,8 @@ -From 1f12359ab18d29323245a5cb22101c7faad3252f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 01:23:22 -0600 Subject: [PATCH] MC-147659 - Fix non black cats spawning in swamp huts ---- - src/main/java/net/minecraft/server/MobSpawnerCat.java | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java index 68d37121f..318d051b0 100644 @@ -22,6 +19,3 @@ index 68d37121f..318d051b0 100644 world.addEntity(entitycat); return 1; } --- -2.26.2 - diff --git a/patches/server/0050-Cows-eat-mushrooms.patch b/patches/server/0050-Cows-eat-mushrooms.patch index a1f4f0ec5..e7bfcc240 100644 --- a/patches/server/0050-Cows-eat-mushrooms.patch +++ b/patches/server/0050-Cows-eat-mushrooms.patch @@ -1,14 +1,8 @@ -From 05066d89da24a21e90810254164ca088a83bd12b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:10:30 -0500 Subject: [PATCH] Cows eat mushrooms ---- - .../java/net/minecraft/server/Entity.java | 1 + - .../java/net/minecraft/server/EntityCow.java | 70 +++++++++++++++++++ - .../net/minecraft/server/EntityLiving.java | 2 +- - .../net/pl3x/purpur/PurpurWorldConfig.java | 5 ++ - 4 files changed, 77 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 7ecf832c2..a6105d8c8 100644 @@ -144,6 +138,3 @@ index 55e609cc1..3d78ac90c 100644 public double creeperChargedChance = 0.0D; private void creeperSettings() { creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance); --- -2.26.2 - diff --git a/patches/server/0051-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0051-Fix-cow-rotation-when-shearing-mooshroom.patch index a3aa7c312..532bb1e3a 100644 --- a/patches/server/0051-Fix-cow-rotation-when-shearing-mooshroom.patch +++ b/patches/server/0051-Fix-cow-rotation-when-shearing-mooshroom.patch @@ -1,11 +1,8 @@ -From e97562ca51fbf4a9530a6d9c509e3cc58454bc78 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 3 May 2019 23:53:16 -0500 Subject: [PATCH] Fix cow rotation when shearing mooshroom ---- - src/main/java/net/minecraft/server/EntityMushroomCow.java | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java index 23ef03306..ecbdc65ec 100644 @@ -26,6 +23,3 @@ index 23ef03306..ecbdc65ec 100644 if (this.hasCustomName()) { entitycow.setCustomName(this.getCustomName()); entitycow.setCustomNameVisible(this.getCustomNameVisible()); --- -2.26.2 - diff --git a/patches/server/0052-Pigs-give-saddle-back.patch b/patches/server/0052-Pigs-give-saddle-back.patch index 9c63789ff..c55808f64 100644 --- a/patches/server/0052-Pigs-give-saddle-back.patch +++ b/patches/server/0052-Pigs-give-saddle-back.patch @@ -1,12 +1,8 @@ -From 411d2c65bb1595b452f13394693486442bb6f0d6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 May 2019 01:14:46 -0500 Subject: [PATCH] Pigs give saddle back ---- - src/main/java/net/minecraft/server/EntityPig.java | 12 ++++++++++++ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 2 files changed, 17 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java index cd0a94794..cf2df391a 100644 @@ -47,6 +43,3 @@ index 3d78ac90c..12d2c8d10 100644 public String polarBearBreedableItemString = ""; public Item polarBearBreedableItem = null; private void polarBearSettings() { --- -2.26.2 - diff --git a/patches/server/0053-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0053-Snowman-drop-and-put-back-pumpkin.patch index 7ffc96e3d..a8d7b2aa2 100644 --- a/patches/server/0053-Snowman-drop-and-put-back-pumpkin.patch +++ b/patches/server/0053-Snowman-drop-and-put-back-pumpkin.patch @@ -1,12 +1,8 @@ -From 3b4921cca8a0bf57db90560da568919c0f9eb3a6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 3 May 2019 23:58:44 -0500 Subject: [PATCH] Snowman drop and put back pumpkin ---- - .../net/minecraft/server/EntitySnowman.java | 17 +++++++++++++++++ - .../java/net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++ - 2 files changed, 24 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java index 15b886d9b..dfe615814 100644 @@ -64,6 +60,3 @@ index 12d2c8d10..a6b048873 100644 public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; private void villagerSettings() { --- -2.26.2 - diff --git a/patches/server/0054-Ender-dragon-always-drop-egg.patch b/patches/server/0054-Ender-dragon-always-drop-egg.patch index 75c545e41..3fb319f56 100644 --- a/patches/server/0054-Ender-dragon-always-drop-egg.patch +++ b/patches/server/0054-Ender-dragon-always-drop-egg.patch @@ -1,12 +1,8 @@ -From ceb530add28a5a0281affb36f744c08ed5358c97 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 7 Feb 2020 04:42:57 -0600 Subject: [PATCH] Ender dragon always drop egg ---- - src/main/java/net/minecraft/server/EnderDragonBattle.java | 2 +- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java index 69faefbdb..ecd6af04d 100644 @@ -37,6 +33,3 @@ index a6b048873..62b94bff3 100644 public boolean foxTypeChangesWithTulips = false; private void foxSettings() { foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips); --- -2.26.2 - diff --git a/patches/server/0055-Ender-dragon-always-drop-full-exp.patch b/patches/server/0055-Ender-dragon-always-drop-full-exp.patch index e5cfef845..5b0445999 100644 --- a/patches/server/0055-Ender-dragon-always-drop-full-exp.patch +++ b/patches/server/0055-Ender-dragon-always-drop-full-exp.patch @@ -1,12 +1,8 @@ -From fee7b773978b346069eb7f6ed84a85deee0ab5a6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 24 Aug 2019 14:42:54 -0500 Subject: [PATCH] Ender dragon always drop full exp ---- - src/main/java/net/minecraft/server/EntityEnderDragon.java | 2 +- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java index 63a759cc1..08fa5a975 100644 @@ -36,6 +32,3 @@ index 62b94bff3..4f4996011 100644 } public boolean foxTypeChangesWithTulips = false; --- -2.26.2 - diff --git a/patches/server/0056-Signs-editable-on-right-click.patch b/patches/server/0056-Signs-editable-on-right-click.patch index 5e9037ba5..1b4bae59d 100644 --- a/patches/server/0056-Signs-editable-on-right-click.patch +++ b/patches/server/0056-Signs-editable-on-right-click.patch @@ -1,13 +1,8 @@ -From 1d831da5983de28f8b50e7df0cb8bf7c4d5ca3e3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 24 May 2019 02:39:25 -0500 Subject: [PATCH] Signs editable on right click ---- - src/main/java/net/minecraft/server/BlockSign.java | 11 +++++++++++ - .../java/net/minecraft/server/TileEntitySign.java | 1 + - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 3 files changed, 17 insertions(+) diff --git a/src/main/java/net/minecraft/server/BlockSign.java b/src/main/java/net/minecraft/server/BlockSign.java index cfc1da1f5..3a9871dbc 100644 @@ -59,6 +54,3 @@ index 4f4996011..227436226 100644 public boolean turtleEggsBreakFromExpOrbs = true; public boolean turtleEggsBreakFromItems = true; public boolean turtleEggsBreakFromMinecarts = true; --- -2.26.2 - diff --git a/patches/server/0057-Signs-allow-color-codes.patch b/patches/server/0057-Signs-allow-color-codes.patch index 391b11a4e..a7354ba2d 100644 --- a/patches/server/0057-Signs-allow-color-codes.patch +++ b/patches/server/0057-Signs-allow-color-codes.patch @@ -1,14 +1,8 @@ -From af34207d367275fdae976891afb02275ebca584b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 17:40:30 -0500 Subject: [PATCH] Signs allow color codes ---- - .../net/minecraft/server/EntityPlayer.java | 1 + - .../minecraft/server/PlayerConnection.java | 8 +++++++ - .../net/minecraft/server/TileEntitySign.java | 23 +++++++++++++++++++ - .../net/pl3x/purpur/PurpurWorldConfig.java | 3 +++ - 4 files changed, 35 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 07f8f0fa7..3556e86fd 100644 @@ -23,10 +17,10 @@ index 07f8f0fa7..3556e86fd 100644 public int nextContainerCounter() { // CraftBukkit - void -> int diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 36519882f..c425578c1 100644 +index bbe56cefe..bf94d3146 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2713,6 +2713,14 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2714,6 +2714,14 @@ public class PlayerConnection implements PacketListenerPlayIn { } } // Paper end @@ -99,6 +93,3 @@ index 227436226..21a2c0c43 100644 } public boolean turtleEggsBreakFromExpOrbs = true; --- -2.26.2 - diff --git a/patches/server/0058-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0058-Allow-soil-to-moisten-from-water-directly-under-it.patch index 263bab322..cb20584d3 100644 --- a/patches/server/0058-Allow-soil-to-moisten-from-water-directly-under-it.patch +++ b/patches/server/0058-Allow-soil-to-moisten-from-water-directly-under-it.patch @@ -1,12 +1,8 @@ -From e53709efa9918c050ce58d74bc8fa6d3c9a37b02 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 21 Jun 2019 14:37:10 -0500 Subject: [PATCH] Allow soil to moisten from water directly under it ---- - .../java/net/minecraft/server/BlockSoil.java | 19 +++++++------------ - .../net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java index a315e2628..8dd48669c 100644 @@ -55,6 +51,3 @@ index 21a2c0c43..70e504ff3 100644 public boolean signAllowColors = false; public boolean signRightClickEdit = false; private void signSettings() { --- -2.26.2 - diff --git a/patches/server/0059-Controllable-Minecarts.patch b/patches/server/0059-Controllable-Minecarts.patch index d558de960..30fdef108 100644 --- a/patches/server/0059-Controllable-Minecarts.patch +++ b/patches/server/0059-Controllable-Minecarts.patch @@ -1,16 +1,8 @@ -From 98634944afd36a98f3cf155a6f73d84007b6bd82 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 29 Jun 2019 02:32:40 -0500 Subject: [PATCH] Controllable Minecarts ---- - .../net/minecraft/server/BlockPosition.java | 6 +++ - .../java/net/minecraft/server/Entity.java | 1 + - .../net/minecraft/server/EntityLiving.java | 6 +-- - .../server/EntityMinecartAbstract.java | 38 +++++++++++++++++++ - .../net/minecraft/server/ItemMinecart.java | 8 ++-- - .../net/pl3x/purpur/PurpurWorldConfig.java | 31 +++++++++++++++ - 6 files changed, 84 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java index 551ca4471..32757e231 100644 @@ -139,7 +131,7 @@ index dc7decb06..0da16c200 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e0dbeaf06..cf546b206 100644 +index 70e504ff3..276131adc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1,5 +1,7 @@ @@ -194,6 +186,3 @@ index e0dbeaf06..cf546b206 100644 public boolean idleTimeoutKick = true; public boolean idleTimeoutTickNearbyEntities = true; public boolean idleTimeoutCountAsSleeping = false; --- -2.26.2 - diff --git a/patches/server/0060-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0060-Disable-loot-drops-on-death-by-cramming.patch index 12b9ab499..84b46cc19 100644 --- a/patches/server/0060-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0060-Disable-loot-drops-on-death-by-cramming.patch @@ -1,12 +1,8 @@ -From 99ca97484fbadcd23964ca8ac80a3a759639f411 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 3 Jul 2019 23:58:31 -0500 Subject: [PATCH] Disable loot drops on death by cramming ---- - src/main/java/net/minecraft/server/EntityLiving.java | 2 ++ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 2 files changed, 7 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index bf8be6012..e42185ad4 100644 @@ -24,7 +20,7 @@ index bf8be6012..e42185ad4 100644 deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 64867b68d..579d5c9ff 100644 +index 276131adc..143908b2d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -110,6 +110,11 @@ public class PurpurWorldConfig { @@ -39,6 +35,3 @@ index 64867b68d..579d5c9ff 100644 public int playerSpawnInvulnerableTicks = 60; public boolean playerInvulnerableWhileAcceptingResourcePack = false; private void playerInvulnerabilities() { --- -2.26.2 - diff --git a/patches/server/0061-Players-should-not-cram-to-death.patch b/patches/server/0061-Players-should-not-cram-to-death.patch index 766c8d860..b69e5c285 100644 --- a/patches/server/0061-Players-should-not-cram-to-death.patch +++ b/patches/server/0061-Players-should-not-cram-to-death.patch @@ -1,11 +1,8 @@ -From 6c0156560acd0c292d202b385d0ca4abcf6e39fc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 21 Jul 2019 18:01:46 -0500 Subject: [PATCH] Players should not cram to death ---- - src/main/java/net/minecraft/server/EntityPlayer.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 3556e86fd..42f3ef1ee 100644 @@ -20,6 +17,3 @@ index 3556e86fd..42f3ef1ee 100644 } @Override --- -2.26.2 - diff --git a/patches/server/0062-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0062-Option-to-toggle-milk-curing-bad-omen.patch index ec243a863..1111572a8 100644 --- a/patches/server/0062-Option-to-toggle-milk-curing-bad-omen.patch +++ b/patches/server/0062-Option-to-toggle-milk-curing-bad-omen.patch @@ -1,12 +1,8 @@ -From 0e01fed709f7230ffaff6accc97538e2d7ce528e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 10 Jul 2019 20:43:05 -0500 Subject: [PATCH] Option to toggle milk curing bad omen ---- - src/main/java/net/minecraft/server/ItemMilkBucket.java | 2 ++ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 2 files changed, 4 insertions(+) diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java index fcf254bba..79554e18f 100644 @@ -23,7 +19,7 @@ index fcf254bba..79554e18f 100644 return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 579d5c9ff..bdc6dc3e8 100644 +index 143908b2d..77e2dce3f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -111,8 +111,10 @@ public class PurpurWorldConfig { @@ -37,6 +33,3 @@ index 579d5c9ff..bdc6dc3e8 100644 } public int playerSpawnInvulnerableTicks = 60; --- -2.26.2 - diff --git a/patches/server/0063-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0063-End-gateway-should-check-if-entity-can-use-portal.patch index 8d2028e24..c35270b44 100644 --- a/patches/server/0063-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0063-End-gateway-should-check-if-entity-can-use-portal.patch @@ -1,11 +1,8 @@ -From 0f2c06bbaafea85a003d29915ddbaaa041ab1e87 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 21 Mar 2020 18:33:05 -0500 Subject: [PATCH] End gateway should check if entity can use portal ---- - src/main/java/net/minecraft/server/TileEntityEndGateway.java | 1 + - 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java index ce239d2b2..d00ca8a53 100644 @@ -19,6 +16,3 @@ index ce239d2b2..d00ca8a53 100644 this.c = 100; if (this.exitPortal == null && this.world.getDimensionKey() == World.THE_END) { this.a((WorldServer) this.world); --- -2.26.2 - diff --git a/patches/server/0064-Debug-stick-should-not-update-neighbors.patch b/patches/server/0064-Debug-stick-should-not-update-neighbors.patch index 1747c39fa..f67b0dca6 100644 --- a/patches/server/0064-Debug-stick-should-not-update-neighbors.patch +++ b/patches/server/0064-Debug-stick-should-not-update-neighbors.patch @@ -1,11 +1,8 @@ -From cd0ac1a5de8b0c879b224d790f3cb8420bcdfca5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 Apr 2020 17:16:30 -0500 Subject: [PATCH] Debug stick should not update neighbors ---- - src/main/java/net/minecraft/server/ItemStack.java | 5 +++++ - 1 file changed, 5 insertions(+) diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java index 007255297..2b2d914de 100644 @@ -23,6 +20,3 @@ index 007255297..2b2d914de 100644 } Item item = this.getItem(); EnumInteractionResult enuminteractionresult = item.a(itemactioncontext); --- -2.26.2 - diff --git a/patches/server/0065-Fix-reloading-paper.yml.patch b/patches/server/0065-Fix-reloading-paper.yml.patch index ecdf8869b..c6d044bda 100644 --- a/patches/server/0065-Fix-reloading-paper.yml.patch +++ b/patches/server/0065-Fix-reloading-paper.yml.patch @@ -1,11 +1,8 @@ -From feeb2ba03825354e6158d559a00dec7e5a446d67 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Jun 2020 21:36:16 -0500 Subject: [PATCH] Fix reloading paper.yml ---- - src/main/java/com/destroystokyo/paper/PaperWorldConfig.java | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java index e471e7649..09fda504d 100644 @@ -28,6 +25,3 @@ index e471e7649..09fda504d 100644 log("-------- World Settings For [" + worldName + "] --------"); PaperConfig.readConfig(PaperWorldConfig.class, this); } --- -2.26.2 - diff --git a/patches/server/0066-Fix-the-dead-lagging-the-server.patch b/patches/server/0066-Fix-the-dead-lagging-the-server.patch index 24c39f76d..c28a89c87 100644 --- a/patches/server/0066-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0066-Fix-the-dead-lagging-the-server.patch @@ -1,12 +1,8 @@ -From 2402604643ff2228ee0eef62a9d22558ccb17316 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 6 Mar 2020 13:37:26 -0600 Subject: [PATCH] Fix the dead lagging the server ---- - src/main/java/net/minecraft/server/Entity.java | 2 +- - src/main/java/net/minecraft/server/EntityLiving.java | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 5b3f287c8..a8706f754 100644 @@ -34,6 +30,3 @@ index e42185ad4..5c4608b7e 100644 double d0 = this.locX() - this.lastX; double d1 = this.locZ() - this.lastZ; float f = (float) (d0 * d0 + d1 * d1); --- -2.26.2 - diff --git a/patches/server/0067-Skip-events-if-there-s-no-listeners.patch b/patches/server/0067-Skip-events-if-there-s-no-listeners.patch index a59e41d58..6f8cb3a19 100644 --- a/patches/server/0067-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0067-Skip-events-if-there-s-no-listeners.patch @@ -1,11 +1,8 @@ -From efbf1cafc98f7392be6f9486a83b9c836e51c57e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 Apr 2020 03:07:59 -0500 Subject: [PATCH] Skip events if there's no listeners ---- - src/main/java/net/minecraft/server/CommandDispatcher.java | 2 ++ - 1 file changed, 2 insertions(+) diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java index e59151d01..4ace0e79c 100644 @@ -27,6 +24,3 @@ index e59151d01..4ace0e79c 100644 entityplayer.playerConnection.sendPacket(new PacketPlayOutCommands(rootcommandnode)); } --- -2.26.2 - diff --git a/patches/server/0068-Add-permission-for-F3-N-debug.patch b/patches/server/0068-Add-permission-for-F3-N-debug.patch index b6ed9f2e1..09781a9b2 100644 --- a/patches/server/0068-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0068-Add-permission-for-F3-N-debug.patch @@ -1,11 +1,8 @@ -From 81fa02e19fb81b0b604a26812e302aef25d2c139 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 28 Dec 2019 04:21:54 -0600 Subject: [PATCH] Add permission for F3+N debug ---- - src/main/java/net/minecraft/server/PlayerList.java | 1 + - 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java index 5807e77da..ec2bbd52c 100644 @@ -19,6 +16,3 @@ index 5807e77da..ec2bbd52c 100644 entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, b0)); } --- -2.26.2 - diff --git a/patches/server/0069-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0069-Add-wither-skeleton-takes-wither-damage-option.patch index 796e1a0fa..4cbe09ff6 100644 --- a/patches/server/0069-Add-wither-skeleton-takes-wither-damage-option.patch +++ b/patches/server/0069-Add-wither-skeleton-takes-wither-damage-option.patch @@ -1,12 +1,8 @@ -From 2434efa14f3f761e4162e93704a900d3efaefc68 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 14 Jan 2020 19:43:40 -0600 Subject: [PATCH] Add wither skeleton takes wither damage option ---- - src/main/java/net/minecraft/server/EntitySkeletonWither.java | 2 +- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java index 1819432e1..f415775ea 100644 @@ -36,6 +32,3 @@ index 77e2dce3f..3e1e1d336 100644 public double zombieHorseSpawnChance = 0.0D; private void zombieHorseSettings() { zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance); --- -2.26.2 - diff --git a/patches/server/0070-Configurable-TPS-Catchup.patch b/patches/server/0070-Configurable-TPS-Catchup.patch index 8f7257f40..bcfb1c48c 100644 --- a/patches/server/0070-Configurable-TPS-Catchup.patch +++ b/patches/server/0070-Configurable-TPS-Catchup.patch @@ -1,12 +1,8 @@ -From 1175c64542b0d22dc132ca2f287b84621fea42d8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 19:06:22 -0500 Subject: [PATCH] Configurable TPS Catchup ---- - src/main/java/net/minecraft/server/MinecraftServer.java | 8 +++++++- - src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 8ed47fe05..5acd2a97c 100644 @@ -41,6 +37,3 @@ index e8a0438ec..f7e5d12cf 100644 + tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup); + } } --- -2.26.2 - diff --git a/patches/server/0071-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0071-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch index 8cd9da3fd..dd7d22883 100644 --- a/patches/server/0071-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch +++ b/patches/server/0071-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch @@ -1,12 +1,8 @@ -From 479f586644cf99b4591a1cc33409c3656696f3ef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 19 Mar 2020 19:39:34 -0500 Subject: [PATCH] Add option to allow loyalty on tridents to work in the void ---- - src/main/java/net/minecraft/server/EntityThrownTrident.java | 2 +- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java index c68002ffe..9be919986 100644 @@ -22,7 +18,7 @@ index c68002ffe..9be919986 100644 if (b0 > 0 && !this.z()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f60434669..11c4742c2 100644 +index 3e1e1d336..61094d4f7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -112,9 +112,11 @@ public class PurpurWorldConfig { @@ -37,6 +33,3 @@ index f60434669..11c4742c2 100644 } public int playerSpawnInvulnerableTicks = 60; --- -2.26.2 - diff --git a/patches/server/0072-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0072-Add-enderman-and-creeper-griefing-controls.patch index 24fc0254d..662b36547 100644 --- a/patches/server/0072-Add-enderman-and-creeper-griefing-controls.patch +++ b/patches/server/0072-Add-enderman-and-creeper-griefing-controls.patch @@ -1,13 +1,8 @@ -From 760b8ff3b7ac193c9afb783f2135f89c08599b18 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 Apr 2020 16:28:38 -0500 Subject: [PATCH] Add enderman and creeper griefing controls ---- - src/main/java/net/minecraft/server/EntityCreeper.java | 2 +- - src/main/java/net/minecraft/server/EntityEnderman.java | 2 ++ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++ - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java index ec5287fa5..848944230 100644 @@ -69,6 +64,3 @@ index 61094d4f7..e6a1d88a2 100644 public boolean foxTypeChangesWithTulips = false; private void foxSettings() { foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips); --- -2.26.2 - diff --git a/patches/server/0073-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0073-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch index 597a2f734..342e39748 100644 --- a/patches/server/0073-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch +++ b/patches/server/0073-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch @@ -1,12 +1,8 @@ -From af5088ad60fdfeb33bb27d80816504f300a7ae0d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 24 Apr 2020 09:33:11 -0500 Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule ---- - src/main/java/net/minecraft/server/EntityInsentient.java | 2 +- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java index 93714e5d9..b23674625 100644 @@ -22,7 +18,7 @@ index 93714e5d9..b23674625 100644 Iterator iterator = list.iterator(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f015c456f..3f1c33b5f 100644 +index e6a1d88a2..1a830b579 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -111,10 +111,12 @@ public class PurpurWorldConfig { @@ -38,6 +34,3 @@ index f015c456f..3f1c33b5f 100644 milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen); tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight); } --- -2.26.2 - diff --git a/patches/server/0074-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0074-Villagers-farming-can-bypass-mob-griefing-gamerule.patch index 4e184bc86..3dab81823 100644 --- a/patches/server/0074-Villagers-farming-can-bypass-mob-griefing-gamerule.patch +++ b/patches/server/0074-Villagers-farming-can-bypass-mob-griefing-gamerule.patch @@ -1,12 +1,8 @@ -From a44c7d5cc513398f71627117ebf48f10ef313555 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 24 Apr 2020 09:37:29 -0500 Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule ---- - src/main/java/net/minecraft/server/BehaviorFarm.java | 2 +- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/BehaviorFarm.java b/src/main/java/net/minecraft/server/BehaviorFarm.java index 54a555509..0ff202c0d 100644 @@ -37,6 +33,3 @@ index 1a830b579..aa8398193 100644 } public boolean witherSkeletonTakesWitherDamage = false; --- -2.26.2 - diff --git a/patches/server/0075-Villagers-follow-emerald-blocks.patch b/patches/server/0075-Villagers-follow-emerald-blocks.patch index fbcc4c52e..a17902cbb 100644 --- a/patches/server/0075-Villagers-follow-emerald-blocks.patch +++ b/patches/server/0075-Villagers-follow-emerald-blocks.patch @@ -1,14 +1,8 @@ -From 4441726b41ea1cf4ea99b60c4ccfa5d19192346a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 22:10:12 -0600 Subject: [PATCH] Villagers follow emerald blocks ---- - src/main/java/net/minecraft/server/EntityVillager.java | 7 +++++++ - .../java/net/minecraft/server/EntityVillagerAbstract.java | 2 ++ - .../java/net/minecraft/server/EntityVillagerTrader.java | 1 + - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++ - 4 files changed, 17 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java index 7925c8991..3e10ee440 100644 @@ -75,6 +69,3 @@ index aa8398193..26a760bc3 100644 } public boolean witherSkeletonTakesWitherDamage = false; --- -2.26.2 - diff --git a/patches/server/0076-Allow-leashing-villagers.patch b/patches/server/0076-Allow-leashing-villagers.patch index 50e75a773..04b96c085 100644 --- a/patches/server/0076-Allow-leashing-villagers.patch +++ b/patches/server/0076-Allow-leashing-villagers.patch @@ -1,14 +1,8 @@ -From a4545096d19b58faaab92c66c6c1c76636f8712b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 ---- - src/main/java/net/minecraft/server/EntityInsentient.java | 1 + - src/main/java/net/minecraft/server/EntityVillager.java | 5 +++++ - .../java/net/minecraft/server/EntityVillagerTrader.java | 7 +++++++ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 4 ++++ - 4 files changed, 17 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java index b23674625..744552fda 100644 @@ -82,6 +76,3 @@ index 26a760bc3..665eac22f 100644 villagerTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", villagerTraderFollowEmeraldBlock); } --- -2.26.2 - diff --git a/patches/server/0077-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0077-Implement-configurable-search-radius-for-villagers-t.patch index fb1e70b69..183ed417f 100644 --- a/patches/server/0077-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0077-Implement-configurable-search-radius-for-villagers-t.patch @@ -1,13 +1,9 @@ -From 8248b744799addcefe0d79f65f93b90708321a49 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 22 Jul 2019 17:32:17 -0500 Subject: [PATCH] Implement configurable search radius for villagers to spawn iron golems ---- - src/main/java/net/minecraft/server/EntityVillager.java | 1 + - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 4 ++++ - 2 files changed, 5 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java index 97eb26482..86de40d15 100644 @@ -42,6 +38,3 @@ index 665eac22f..e3904be3f 100644 } public boolean villagerTraderCanBeLeashed = false; --- -2.26.2 - diff --git a/patches/server/0078-Implement-infinite-lava.patch b/patches/server/0078-Implement-infinite-lava.patch index 0180299b5..72b026001 100644 --- a/patches/server/0078-Implement-infinite-lava.patch +++ b/patches/server/0078-Implement-infinite-lava.patch @@ -1,13 +1,8 @@ -From e3522741cc2826ab18f1ef238131d117d24fa2c8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 23 Nov 2019 17:55:42 -0600 Subject: [PATCH] Implement infinite lava ---- - src/main/java/net/minecraft/server/FluidTypeFlowing.java | 9 ++++++++- - src/main/java/net/minecraft/server/FluidTypeLava.java | 7 +++++++ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java index d72a88e92..e9656641b 100644 @@ -70,6 +65,3 @@ index e3904be3f..de71f617d 100644 public boolean signAllowColors = false; public boolean signRightClickEdit = false; private void signSettings() { --- -2.26.2 - diff --git a/patches/server/0079-Make-lava-flow-speed-configurable.patch b/patches/server/0079-Make-lava-flow-speed-configurable.patch index 94e21a7e0..2c71849dd 100644 --- a/patches/server/0079-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0079-Make-lava-flow-speed-configurable.patch @@ -1,12 +1,8 @@ -From 1ecb5038187aea57699d76b56df6710ee947774f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 11:31:36 -0600 Subject: [PATCH] Make lava flow speed configurable ---- - src/main/java/net/minecraft/server/FluidTypeLava.java | 2 +- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java index 9e543449c..fb501a6c5 100644 @@ -38,6 +34,3 @@ index de71f617d..58b21bc81 100644 } public boolean signAllowColors = false; --- -2.26.2 - diff --git a/patches/server/0080-Add-player-death-exp-control-options.patch b/patches/server/0080-Add-player-death-exp-control-options.patch index 108fb0d8c..7b53a1c82 100644 --- a/patches/server/0080-Add-player-death-exp-control-options.patch +++ b/patches/server/0080-Add-player-death-exp-control-options.patch @@ -1,12 +1,8 @@ -From c9f22b56871cccda18e36d7802be88fe7782a56e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 ---- - .../java/net/minecraft/server/EntityHuman.java | 17 ++++++++++++++--- - .../java/net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++ - 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index a69a69859..ea4144371 100644 @@ -44,7 +40,7 @@ index a69a69859..ea4144371 100644 return 0; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2ac578bda..86b3cdcdc 100644 +index 58b21bc81..2d2dfe572 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -121,6 +121,13 @@ public class PurpurWorldConfig { @@ -61,6 +57,3 @@ index 2ac578bda..86b3cdcdc 100644 public int playerSpawnInvulnerableTicks = 60; public boolean playerInvulnerableWhileAcceptingResourcePack = false; private void playerInvulnerabilities() { --- -2.26.2 - diff --git a/patches/server/0081-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0081-Add-option-to-disable-saving-projectiles-to-disk.patch index 63b54d3c9..6dd2ca4e9 100644 --- a/patches/server/0081-Add-option-to-disable-saving-projectiles-to-disk.patch +++ b/patches/server/0081-Add-option-to-disable-saving-projectiles-to-disk.patch @@ -1,15 +1,8 @@ -From d0d2ae9b7bb99f89e9d17307354d00d8e4dc9426 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 18 Feb 2020 20:07:08 -0600 Subject: [PATCH] Add option to disable saving projectiles to disk ---- - .../java/net/minecraft/server/ChunkRegionLoader.java | 1 + - src/main/java/net/minecraft/server/Entity.java | 6 ++++++ - .../java/net/minecraft/server/EntityEnderSignal.java | 9 ++++++++- - src/main/java/net/minecraft/server/IProjectile.java | 7 +++++++ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java index 742c59cb0..2b2471072 100644 @@ -81,7 +74,7 @@ index a961f5d5d..c5d788f22 100644 if (entity != null) { this.shooter = entity.getUniqueID(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 86b3cdcdc..571fb0d11 100644 +index 2d2dfe572..6ac786206 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -113,11 +113,13 @@ public class PurpurWorldConfig { @@ -98,6 +91,3 @@ index 86b3cdcdc..571fb0d11 100644 tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight); } --- -2.26.2 - diff --git a/patches/server/0082-Configurable-void-damage-height.patch b/patches/server/0082-Configurable-void-damage-height.patch index f9d8ec7d3..f46303d9e 100644 --- a/patches/server/0082-Configurable-void-damage-height.patch +++ b/patches/server/0082-Configurable-void-damage-height.patch @@ -1,12 +1,8 @@ -From 111b356fa5f54cb0fe72f479074d657cd7813aa3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 27 Feb 2020 21:42:19 -0600 Subject: [PATCH] Configurable void damage height ---- - src/main/java/net/minecraft/server/Entity.java | 2 +- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 17c591b82..8f5151de8 100644 @@ -22,7 +18,7 @@ index 17c591b82..8f5151de8 100644 && this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 571fb0d11..199e0b8fe 100644 +index 6ac786206..a071129db 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -115,12 +115,14 @@ public class PurpurWorldConfig { @@ -40,6 +36,3 @@ index 571fb0d11..199e0b8fe 100644 } public String playerDeathExpDropEquation = "expLevel * 7"; --- -2.26.2 - diff --git a/patches/server/0083-Add-option-for-zombies-targetting-turtle-eggs.patch b/patches/server/0083-Add-option-for-zombies-targetting-turtle-eggs.patch index cf07efc8d..c558c2ee4 100644 --- a/patches/server/0083-Add-option-for-zombies-targetting-turtle-eggs.patch +++ b/patches/server/0083-Add-option-for-zombies-targetting-turtle-eggs.patch @@ -1,12 +1,8 @@ -From 5d90f058ef1435883c0c54a4d97332cfb6aa49e6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 17 Aug 2019 15:27:09 -0500 Subject: [PATCH] Add option for zombies targetting turtle eggs ---- - src/main/java/net/minecraft/server/EntityZombie.java | 2 +- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java index b66059836..00b89746f 100644 @@ -37,6 +33,3 @@ index a071129db..7da85ba5a 100644 public double zombieHorseSpawnChance = 0.0D; private void zombieHorseSettings() { zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance); --- -2.26.2 - diff --git a/patches/server/0084-Dispenser-curse-of-binding-protection.patch b/patches/server/0084-Dispenser-curse-of-binding-protection.patch index 9f8fac528..88101c90d 100644 --- a/patches/server/0084-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0084-Dispenser-curse-of-binding-protection.patch @@ -1,13 +1,8 @@ -From 249401116e52f1e2a190192b38be512a6d71d087 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 25 Aug 2019 00:09:52 -0500 Subject: [PATCH] Dispenser curse of binding protection ---- - src/main/java/net/minecraft/server/EntityInsentient.java | 7 +++++++ - src/main/java/net/minecraft/server/ItemArmor.java | 3 ++- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ - 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java index 744552fda..8def5fbfb 100644 @@ -64,6 +59,3 @@ index 7da85ba5a..f741218df 100644 public boolean farmlandGetsMoistFromBelow = false; private void farmlandSettings() { farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow); --- -2.26.2 - diff --git a/patches/server/0085-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0085-Add-option-for-boats-to-eject-players-on-land.patch index 1de17b79e..83ef8eaf3 100644 --- a/patches/server/0085-Add-option-for-boats-to-eject-players-on-land.patch +++ b/patches/server/0085-Add-option-for-boats-to-eject-players-on-land.patch @@ -1,12 +1,8 @@ -From 26dbc8b8d852967b41e5f9e18faeb1adfebbcaea Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 ---- - src/main/java/net/minecraft/server/EntityBoat.java | 1 + - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 2 files changed, 3 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java index 409e0ac0a..a20d6feb8 100644 @@ -21,7 +17,7 @@ index 409e0ac0a..a20d6feb8 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 4d0687146..b90777b55 100644 +index f741218df..15e2d9dd0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -110,6 +110,7 @@ public class PurpurWorldConfig { @@ -40,6 +36,3 @@ index 4d0687146..b90777b55 100644 disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath); entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing); milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen); --- -2.26.2 - diff --git a/patches/server/0086-Add-obfhelpers-for-plugin-use.patch b/patches/server/0086-Add-obfhelpers-for-plugin-use.patch index 90ad16af8..3aad4933b 100644 --- a/patches/server/0086-Add-obfhelpers-for-plugin-use.patch +++ b/patches/server/0086-Add-obfhelpers-for-plugin-use.patch @@ -1,12 +1,8 @@ -From f7725461d43a8dabef8e3455f1c11a9a323be4bb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 1 Jan 2020 20:12:39 -0600 Subject: [PATCH] Add obfhelpers for plugin use ---- - src/main/java/net/minecraft/server/ItemStack.java | 1 + - src/main/java/net/minecraft/server/NBTTagString.java | 1 + - 2 files changed, 2 insertions(+) diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java index 2b2d914de..c2e57a976 100644 @@ -32,6 +28,3 @@ index 7ef237831..44121316c 100644 public static NBTTagString a(String s) { return s.isEmpty() ? NBTTagString.b : new NBTTagString(s); } --- -2.26.2 - diff --git a/patches/server/0087-Mending-mends-most-damages-equipment-first.patch b/patches/server/0087-Mending-mends-most-damages-equipment-first.patch index 14a73c01d..b383490c6 100644 --- a/patches/server/0087-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0087-Mending-mends-most-damages-equipment-first.patch @@ -1,14 +1,8 @@ -From a0a344e5fa7ecf22e47fd9b885af1c07d8de28d2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 14 Jul 2019 19:52:47 -0500 Subject: [PATCH] Mending mends most damages equipment first ---- - .../minecraft/server/EnchantmentManager.java | 26 ++++++++++++++++++- - .../minecraft/server/EntityExperienceOrb.java | 2 +- - .../java/net/minecraft/server/ItemStack.java | 9 +++++++ - .../net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java index 92ceb8bb7..1acfea287 100644 @@ -87,7 +81,7 @@ index c2e57a976..51e70db21 100644 return this.tag == null ? 0 : this.tag.getInt("Damage"); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b90777b55..5079bd0f6 100644 +index 15e2d9dd0..993ad17ec 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -110,6 +110,7 @@ public class PurpurWorldConfig { @@ -106,6 +100,3 @@ index b90777b55..5079bd0f6 100644 boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand); disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath); entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing); --- -2.26.2 - diff --git a/patches/server/0088-Implement-bamboo-growth-settings.patch b/patches/server/0088-Implement-bamboo-growth-settings.patch index f64b908da..cadafa2d1 100644 --- a/patches/server/0088-Implement-bamboo-growth-settings.patch +++ b/patches/server/0088-Implement-bamboo-growth-settings.patch @@ -1,12 +1,8 @@ -From 68ce75bdc5411e92483f32f1b6c3a02dba4e5041 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 23 Aug 2019 20:57:29 -0500 Subject: [PATCH] Implement bamboo growth settings ---- - src/main/java/net/minecraft/server/BlockBamboo.java | 12 ++++++------ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++ - 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java index 14790c167..bac1b8b30 100644 @@ -84,6 +80,3 @@ index 993ad17ec..a9b1a130b 100644 public boolean dispenserApplyCursedArmor = true; private void dispenserSettings() { dispenserApplyCursedArmor = getBoolean("blocks.dispenser.apply-cursed-to-armor-slots", dispenserApplyCursedArmor); --- -2.26.2 - diff --git a/patches/server/0089-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0089-Climbing-should-not-bypass-cramming-gamerule.patch index 74c296520..bae920977 100644 --- a/patches/server/0089-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0089-Climbing-should-not-bypass-cramming-gamerule.patch @@ -1,21 +1,8 @@ -From cfdff7f48317faf48b2672c813799cf269bac163 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 21 Jul 2019 18:06:20 -0500 Subject: [PATCH] Climbing should not bypass cramming gamerule ---- - src/main/java/net/minecraft/server/Entity.java | 6 ++++++ - src/main/java/net/minecraft/server/EntityArmorStand.java | 2 +- - src/main/java/net/minecraft/server/EntityBat.java | 2 +- - src/main/java/net/minecraft/server/EntityBoat.java | 2 +- - .../java/net/minecraft/server/EntityHorseAbstract.java | 2 +- - src/main/java/net/minecraft/server/EntityLiving.java | 6 +++--- - .../java/net/minecraft/server/EntityMinecartAbstract.java | 2 +- - src/main/java/net/minecraft/server/EntityParrot.java | 4 ++-- - src/main/java/net/minecraft/server/EntityPlayer.java | 4 ++-- - src/main/java/net/minecraft/server/IEntitySelector.java | 8 +++++++- - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 11 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 8f5151de8..7a4cc7c30 100644 @@ -177,7 +164,7 @@ index 9b4795f3b..192d9798c 100644 } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ey())) { return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6752119a7..0b3a7e01c 100644 +index a9b1a130b..860e25dfd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -114,6 +114,7 @@ public class PurpurWorldConfig { @@ -196,6 +183,3 @@ index 6752119a7..0b3a7e01c 100644 milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen); saveProjectilesToDisk = getBoolean("gameplay-mechanics.save-projectiles-to-disk", saveProjectilesToDisk); tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight); --- -2.26.2 - diff --git a/patches/server/0090-Add-5-second-tps-average-in-tps.patch b/patches/server/0090-Add-5-second-tps-average-in-tps.patch index a503895db..4ace9635f 100644 --- a/patches/server/0090-Add-5-second-tps-average-in-tps.patch +++ b/patches/server/0090-Add-5-second-tps-average-in-tps.patch @@ -1,13 +1,8 @@ -From fc287d75839f8114bab6c97c2c32c68a5d24411a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 28 Jul 2019 01:27:37 -0500 Subject: [PATCH] Add 5 second tps average in /tps ---- - .../java/net/minecraft/server/MinecraftServer.java | 13 +++++++++---- - .../java/org/bukkit/craftbukkit/CraftServer.java | 1 + - .../java/org/spigotmc/TicksPerSecondCommand.java | 2 +- - 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 5acd2a97c..6c0854623 100644 @@ -76,6 +71,3 @@ index 7218f23df..3c7b9a6d2 100644 if (args.length > 0 && args[0].equals("mem") && sender.hasPermission("bukkit.command.tpsmemory")) { sender.sendMessage(ChatColor.GOLD + "Current Memory Usage: " + ChatColor.GREEN + ((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / (1024 * 1024)) + "/" + (Runtime.getRuntime().totalMemory() / (1024 * 1024)) + " mb (Max: " + (Runtime.getRuntime().maxMemory() / (1024 * 1024)) + " mb)"); if (!hasShownMemoryWarning) { --- -2.26.2 - diff --git a/patches/server/0091-Implement-elytra-settings.patch b/patches/server/0091-Implement-elytra-settings.patch index 8bc21aedc..a2b1fef71 100644 --- a/patches/server/0091-Implement-elytra-settings.patch +++ b/patches/server/0091-Implement-elytra-settings.patch @@ -1,15 +1,8 @@ -From 85896f8b272bddb5fc7534f54b0a0bad07c1bd8f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 ---- - .../java/net/minecraft/server/EntityLiving.java | 11 ++++++++++- - .../java/net/minecraft/server/ItemFireworks.java | 8 ++++++++ - src/main/java/net/minecraft/server/ItemStack.java | 8 +++++++- - src/main/java/net/minecraft/server/ItemTrident.java | 10 ++++++++++ - .../java/net/pl3x/purpur/PurpurWorldConfig.java | 13 +++++++++++++ - 5 files changed, 48 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index 18a49e69a..d02d7f21c 100644 @@ -100,7 +93,7 @@ index 32982bb47..a0e4d46ab 100644 entityhuman.r(20); if (entityhuman.isOnGround()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0b3a7e01c..c1faba57f 100644 +index 860e25dfd..d1b0d4030 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -131,6 +131,19 @@ public class PurpurWorldConfig { @@ -123,6 +116,3 @@ index 0b3a7e01c..c1faba57f 100644 public String playerDeathExpDropEquation = "expLevel * 7"; public int playerDeathExpDropMax = 100; private void playerDeathExpSettings() { --- -2.26.2 - diff --git a/patches/server/0092-Add-item-entity-options.patch b/patches/server/0092-Add-item-entity-options.patch index 81b2c33fa..1c6237644 100644 --- a/patches/server/0092-Add-item-entity-options.patch +++ b/patches/server/0092-Add-item-entity-options.patch @@ -1,13 +1,8 @@ -From a156ba8ddc37e18eab14d265cacf4940c596cfa6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 22 Feb 2020 15:54:08 -0600 Subject: [PATCH] Add item entity options ---- - src/main/java/net/minecraft/server/Entity.java | 1 + - .../java/net/minecraft/server/EntityItem.java | 4 +++- - .../java/net/pl3x/purpur/PurpurWorldConfig.java | 15 +++++++++++++++ - 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 7a4cc7c30..476ca65a4 100644 @@ -44,7 +39,7 @@ index a7860cb4d..77e970c30 100644 // CraftBukkit start if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 19e87de9f..b756a95e6 100644 +index d1b0d4030..9de724686 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -99,6 +99,21 @@ public class PurpurWorldConfig { @@ -69,6 +64,3 @@ index 19e87de9f..b756a95e6 100644 public boolean idleTimeoutKick = true; public boolean idleTimeoutTickNearbyEntities = true; public boolean idleTimeoutCountAsSleeping = false; --- -2.26.2 - diff --git a/patches/server/0093-Add-ping-command.patch b/patches/server/0093-Add-ping-command.patch index 8770c840a..e1f044eee 100644 --- a/patches/server/0093-Add-ping-command.patch +++ b/patches/server/0093-Add-ping-command.patch @@ -1,16 +1,8 @@ -From 13ff42eb6bcfe97f9bcda34e85a1c46476430aac Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 13 Mar 2020 22:29:10 -0500 Subject: [PATCH] Add /ping command ---- - .../net/minecraft/server/ArgumentEntity.java | 2 + - .../minecraft/server/CommandDispatcher.java | 5 ++- - .../server/CommandListenerWrapper.java | 1 + - .../java/net/pl3x/purpur/PurpurConfig.java | 2 + - .../net/pl3x/purpur/command/PingCommand.java | 37 +++++++++++++++++++ - 5 files changed, 46 insertions(+), 1 deletion(-) - create mode 100644 src/main/java/net/pl3x/purpur/command/PingCommand.java diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java index 1194f91a5..9141976d1 100644 @@ -134,6 +126,3 @@ index 000000000..f36e655cb + return targets.size(); + } +} --- -2.26.2 - diff --git a/patches/server/0094-Configurable-jockey-options.patch b/patches/server/0094-Configurable-jockey-options.patch index ef980a508..2ebc1c6a3 100644 --- a/patches/server/0094-Configurable-jockey-options.patch +++ b/patches/server/0094-Configurable-jockey-options.patch @@ -1,16 +1,8 @@ -From f48aaf5a54ddeedc4009bd0349f896644e0422c3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 21:39:32 -0500 Subject: [PATCH] Configurable jockey options ---- - .../net/minecraft/server/EntityDrowned.java | 17 ++++++++ - .../net/minecraft/server/EntityPigZombie.java | 17 ++++++++ - .../net/minecraft/server/EntityZombie.java | 31 ++++++++++---- - .../minecraft/server/EntityZombieHusk.java | 17 ++++++++ - .../server/EntityZombieVillager.java | 17 ++++++++ - .../net/pl3x/purpur/PurpurWorldConfig.java | 42 +++++++++++++++++++ - 6 files changed, 134 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java index e6425bdf1..455b1d922 100644 @@ -274,6 +266,3 @@ index 9de724686..3e067c832 100644 + zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens); + } } --- -2.26.2 - diff --git a/patches/server/0095-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0095-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 6e3e08c37..dc9a68da0 100644 --- a/patches/server/0095-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0095-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -1,15 +1,8 @@ -From e95d4c23dd09c9d68dbedcdd72de0c74320d9265 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 18:26:06 -0500 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms ---- - .../net/minecraft/server/DamageSource.java | 1 + - .../java/net/minecraft/server/Entity.java | 5 +- - .../minecraft/server/EntityEnderCrystal.java | 49 +++++ - .../net/minecraft/server/EntityPhantom.java | 174 +++++++++++++++++- - .../net/pl3x/purpur/PurpurWorldConfig.java | 9 + - 5 files changed, 229 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java index 6fe5678cf..bd0267ee4 100644 @@ -355,6 +348,3 @@ index 3e067c832..f2ca515c9 100644 public boolean pigGiveSaddleBack = false; private void pigSettings() { pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack); --- -2.26.2 - diff --git a/patches/server/0096-Convert-legacy-item-text.patch b/patches/server/0096-Convert-legacy-item-text.patch index efc262621..11b6eaf0c 100644 --- a/patches/server/0096-Convert-legacy-item-text.patch +++ b/patches/server/0096-Convert-legacy-item-text.patch @@ -1,11 +1,8 @@ -From fa486db80a9ffdc62e4397c12bbbfa34cc09a2c6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 29 Jun 2020 08:56:53 -0500 Subject: [PATCH] Convert legacy item text ---- - .../java/net/minecraft/server/ItemStack.java | 46 +++++++++++++++++++ - 1 file changed, 46 insertions(+) diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java index 54421c56c..bb369c822 100644 @@ -78,6 +75,3 @@ index 54421c56c..bb369c822 100644 @Nullable public NBTTagCompound b(String s) { return this.tag != null && this.tag.hasKeyOfType(s, 10) ? this.tag.getCompound(s) : null; --- -2.26.2 - diff --git a/patches/server/0097-Customizable-EnderDragon-Health.patch b/patches/server/0097-Customizable-EnderDragon-Health.patch index 5e89fb6c8..5853b9ced 100644 --- a/patches/server/0097-Customizable-EnderDragon-Health.patch +++ b/patches/server/0097-Customizable-EnderDragon-Health.patch @@ -1,12 +1,8 @@ -From 851c024121def856a1d8a096404a03684a761b30 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jason Bierque Date: Wed, 1 Jul 2020 22:36:06 +0200 Subject: [PATCH] Customizable EnderDragon Health ---- - .../java/net/minecraft/server/EntityEnderDragon.java | 10 ++++++++++ - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 2 files changed, 12 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java index 08fa5a975..e08e6014f 100644 @@ -45,6 +41,3 @@ index f2ca515c9..e6b41ab92 100644 } public boolean endermanAllowGriefing = true; --- -2.26.2 -