From 2f05302c9bcfc9cfaf68e6e7e1ae31358970c426 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 7 May 2020 16:59:29 +0200 Subject: [PATCH] Update upstream --- Tuinity | 2 +- ...-EMC-Add-a-PlayerThrowTrident-event.patch} | 4 +- ...-EMC-Add-a-PotionExtiguishFire-Event.patch | 91 ------------------- ...-EMC-Add-a-BlockHarvestBeehiveEvent.patch} | 4 +- ...t.patch => 0029-Kill-AnnotationTest.patch} | 4 +- ... => 0030-Add-GameProfileLookupEvent.patch} | 6 +- ...patch => 0031-Add-getLastTickMs-api.patch} | 16 ++-- ...0032-Add-NBT-API-as-first-class-lib.patch} | 8 +- ...h => 0033-EMC-Add-ChatColor.getById.patch} | 2 +- patches/server/0001-Modify-POM.patch | 8 +- patches/server/0002-Brandings.patch | 10 +- .../server/0004-EMC-PlayerUseItem-Event.patch | 6 +- .../0008-EMC-MovedTooQuickly-event.patch | 6 +- patches/server/0011-EMC-Disable-Snooper.patch | 6 +- .../0015-EMC-EntityKnockbackEvent.patch | 8 +- patches/server/0017-EMC-Accept-the-EULA.patch | 6 +- .../server/0022-EMC-ServerReloadEvent.patch | 6 +- .../0023-EMC-SnowmanThrowSnowballEvent.patch | 8 +- .../0026-EMC-EntityAttackedEntityEvent.patch | 6 +- ...fault-don-t-use-blockstate-snapshots.patch | 6 +- ...it.createInventory-with-type-LECTERN.patch | 6 +- ...33-EMC-Add-PotionExtinguishFireEvent.patch | 38 -------- ...EMC-Add-the-PlayerThrowTridentEvent.patch} | 4 +- ...MC-Add-the-BlockHarvestBeehiveEvent.patch} | 4 +- ...ed-server-showing-in-ping-before-se.patch} | 2 +- ...036-Don-t-save-Fireworks-and-Arrows.patch} | 6 +- ...-Purpur-Disable-outdated-build-check.patch | 25 ----- ... => 0037-Add-GameProfileLookupEvent.patch} | 2 +- ...patch => 0038-Add-getLastTickMs-api.patch} | 12 +-- ...ig-yapfa-command-and-basic-settings.patch} | 18 ++-- ... 0040-Kill-the-vanilla-GameProfiler.patch} | 4 +- ...write-Pathfinder-to-not-use-Streams.patch} | 2 +- ...e.patch => 0042-Remove-Stream-usage.patch} | 22 ++--- ...ly-players-to-have-collisions-with-.patch} | 6 +- ...low-to-change-the-piston-push-limit.patch} | 2 +- ...dd-option-for-pushable-TileEntities.patch} | 6 +- ...0046-Add-NBT-API-as-first-class-lib.patch} | 6 +- ... => 0047-Player-saving-async-FileIO.patch} | 10 +- ...-method-to-call-itself-more-than-on.patch} | 4 +- ...le-I-O-operation-on-load-player-fil.patch} | 2 +- ...=> 0050-Akarin-Save-json-list-async.patch} | 2 +- ...in-Cache-hashcode-for-BlockPosition.patch} | 4 +- ...mize-door-interact-with-pathfinding.patch} | 2 +- ...Fix-Always-increment-arrow-despawn-.patch} | 2 +- ...Skip-events-if-there-s-no-listeners.patch} | 10 +- ...0055-Purpur-Add-more-timings-timers.patch} | 28 +++--- ...atch => 0056-Modify-default-configs.patch} | 8 +- 47 files changed, 149 insertions(+), 301 deletions(-) rename patches/api/{0028-EMC-Add-a-PlayerThrowTrident-event.patch => 0027-EMC-Add-a-PlayerThrowTrident-event.patch} (95%) delete mode 100644 patches/api/0027-EMC-Add-a-PotionExtiguishFire-Event.patch rename patches/api/{0029-EMC-Add-a-BlockHarvestBeehiveEvent.patch => 0028-EMC-Add-a-BlockHarvestBeehiveEvent.patch} (96%) rename patches/api/{0030-Kill-AnnotationTest.patch => 0029-Kill-AnnotationTest.patch} (99%) rename patches/api/{0031-Add-GameProfileLookupEvent.patch => 0030-Add-GameProfileLookupEvent.patch} (95%) rename patches/api/{0032-Add-getLastTickMs-api.patch => 0031-Add-getLastTickMs-api.patch} (74%) rename patches/api/{0033-Add-NBT-API-as-first-class-lib.patch => 0032-Add-NBT-API-as-first-class-lib.patch} (96%) rename patches/api/{0034-EMC-Add-ChatColor.getById.patch => 0033-EMC-Add-ChatColor.getById.patch} (95%) delete mode 100644 patches/server/0033-EMC-Add-PotionExtinguishFireEvent.patch rename patches/server/{0034-EMC-Add-the-PlayerThrowTridentEvent.patch => 0033-EMC-Add-the-PlayerThrowTridentEvent.patch} (92%) rename patches/server/{0035-EMC-Add-the-BlockHarvestBeehiveEvent.patch => 0034-EMC-Add-the-BlockHarvestBeehiveEvent.patch} (93%) rename patches/server/{0037-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch => 0035-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch} (94%) rename patches/server/{0038-Don-t-save-Fireworks-and-Arrows.patch => 0036-Don-t-save-Fireworks-and-Arrows.patch} (84%) delete mode 100644 patches/server/0036-Purpur-Disable-outdated-build-check.patch rename patches/server/{0039-Add-GameProfileLookupEvent.patch => 0037-Add-GameProfileLookupEvent.patch} (98%) rename patches/server/{0040-Add-getLastTickMs-api.patch => 0038-Add-getLastTickMs-api.patch} (91%) rename patches/server/{0041-Add-config-yapfa-command-and-basic-settings.patch => 0039-Add-config-yapfa-command-and-basic-settings.patch} (96%) rename patches/server/{0042-Kill-the-vanilla-GameProfiler.patch => 0040-Kill-the-vanilla-GameProfiler.patch} (96%) rename patches/server/{0043-Rewrite-Pathfinder-to-not-use-Streams.patch => 0041-Rewrite-Pathfinder-to-not-use-Streams.patch} (97%) rename patches/server/{0044-Remove-Stream-usage.patch => 0042-Remove-Stream-usage.patch} (96%) rename patches/server/{0045-Add-option-for-only-players-to-have-collisions-with-.patch => 0043-Add-option-for-only-players-to-have-collisions-with-.patch} (92%) rename patches/server/{0046-Allow-to-change-the-piston-push-limit.patch => 0044-Allow-to-change-the-piston-push-limit.patch} (97%) rename patches/server/{0047-Add-option-for-pushable-TileEntities.patch => 0045-Add-option-for-pushable-TileEntities.patch} (99%) rename patches/server/{0048-Add-NBT-API-as-first-class-lib.patch => 0046-Add-NBT-API-as-first-class-lib.patch} (88%) rename patches/server/{0049-Player-saving-async-FileIO.patch => 0047-Player-saving-async-FileIO.patch} (98%) rename patches/server/{0050-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch => 0048-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch} (98%) rename patches/server/{0051-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch => 0049-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch} (96%) rename patches/server/{0052-Akarin-Save-json-list-async.patch => 0050-Akarin-Save-json-list-async.patch} (96%) rename patches/server/{0053-Akarin-Cache-hashcode-for-BlockPosition.patch => 0051-Akarin-Cache-hashcode-for-BlockPosition.patch} (96%) rename patches/server/{0054-Akarin-Optimize-door-interact-with-pathfinding.patch => 0052-Akarin-Optimize-door-interact-with-pathfinding.patch} (99%) rename patches/server/{0055-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch => 0053-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch} (96%) rename patches/server/{0056-Purpur-Skip-events-if-there-s-no-listeners.patch => 0054-Purpur-Skip-events-if-there-s-no-listeners.patch} (74%) rename patches/server/{0057-Purpur-Add-more-timings-timers.patch => 0055-Purpur-Add-more-timings-timers.patch} (93%) rename patches/server/{0058-Modify-default-configs.patch => 0056-Modify-default-configs.patch} (90%) diff --git a/Tuinity b/Tuinity index e00a4e3c..3591effa 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit e00a4e3c32a410b7c3668d0a267044da5df575f6 +Subproject commit 3591effade8ce818ec09ba2caef0fc9eca9e8728 diff --git a/patches/api/0028-EMC-Add-a-PlayerThrowTrident-event.patch b/patches/api/0027-EMC-Add-a-PlayerThrowTrident-event.patch similarity index 95% rename from patches/api/0028-EMC-Add-a-PlayerThrowTrident-event.patch rename to patches/api/0027-EMC-Add-a-PlayerThrowTrident-event.patch index 0c596900..27d4dea4 100644 --- a/patches/api/0028-EMC-Add-a-PlayerThrowTrident-event.patch +++ b/patches/api/0027-EMC-Add-a-PlayerThrowTrident-event.patch @@ -1,4 +1,4 @@ -From b5460992e5d12d962a1ae4bff91a0a4902fadb2a Mon Sep 17 00:00:00 2001 +From bad232b6909250e81f97bc0e4c75d2d9d34d76db Mon Sep 17 00:00:00 2001 From: chickeneer Date: Fri, 29 Nov 2019 02:47:35 -0600 Subject: [PATCH] EMC Add a PlayerThrowTrident event @@ -10,7 +10,7 @@ Subject: [PATCH] EMC Add a PlayerThrowTrident event diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerThrowTridentEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerThrowTridentEvent.java new file mode 100644 -index 00000000..1ee88dcf +index 000000000..1ee88dcf3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerThrowTridentEvent.java @@ -0,0 +1,49 @@ diff --git a/patches/api/0027-EMC-Add-a-PotionExtiguishFire-Event.patch b/patches/api/0027-EMC-Add-a-PotionExtiguishFire-Event.patch deleted file mode 100644 index 5dd24fd9..00000000 --- a/patches/api/0027-EMC-Add-a-PotionExtiguishFire-Event.patch +++ /dev/null @@ -1,91 +0,0 @@ -From ea4dd0356a413d2781b369b8f00f94266aaa15d9 Mon Sep 17 00:00:00 2001 -From: chickeneer -Date: Thu, 28 Nov 2019 20:36:54 -0600 -Subject: [PATCH] EMC Add a PotionExtiguishFire Event - -Certain thrown potions will extinguish fire and campfires. -This event adds the ability to cancel this ---- - .../entity/PotionExtinguishFireEvent.java | 70 +++++++++++++++++++ - 1 file changed, 70 insertions(+) - create mode 100644 src/main/java/com/destroystokyo/paper/event/entity/PotionExtinguishFireEvent.java - -diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PotionExtinguishFireEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PotionExtinguishFireEvent.java -new file mode 100644 -index 00000000..2e27d7bb ---- /dev/null -+++ b/src/main/java/com/destroystokyo/paper/event/entity/PotionExtinguishFireEvent.java -@@ -0,0 +1,70 @@ -+package com.destroystokyo.paper.event.entity; -+ -+import org.bukkit.block.Block; -+import org.bukkit.entity.ThrownPotion; -+import org.bukkit.event.Cancellable; -+import org.bukkit.event.HandlerList; -+import org.bukkit.event.entity.EntityEvent; -+ -+/** -+ * Lets you cancel a thrown potion from extinguishing a block such as fire or a campfire -+ * -+ * Note that a single potion may attempt to extinguish multiple blocks -+ */ -+public class PotionExtinguishFireEvent extends EntityEvent implements Cancellable { -+ private static final HandlerList handlers = new HandlerList(); -+ private boolean canceled; -+ -+ private final Block block; -+ -+ public PotionExtinguishFireEvent(ThrownPotion entity, Block block) { -+ super(entity); -+ this.block = block; -+ } -+ -+ /** -+ * @return The Potion that is extinguishing the block -+ */ -+ public ThrownPotion getPotion() { -+ return (ThrownPotion) entity; -+ } -+ -+ /** -+ * @return The Potion that is extinguishing the block -+ */ -+ public ThrownPotion getEntity() { -+ return (ThrownPotion) entity; -+ } -+ -+ /** -+ * @return The block being extinguished -+ */ -+ public Block getBlock() { -+ return block; -+ } -+ -+ /** -+ * @return If the block being extinguished should be cancelled -+ */ -+ public boolean isCancelled() { -+ return canceled; -+ } -+ -+ /** -+ * Whether or not to cancel the extinguishing of the given block -+ * @param cancel true if you wish to cancel this event -+ */ -+ public void setCancelled(boolean cancel) { -+ canceled = cancel; -+ } -+ -+ public HandlerList getHandlers() { -+ return handlers; -+ } -+ -+ public static HandlerList getHandlerList() { -+ return handlers; -+ } -+ -+ -+} --- -2.25.1.windows.1 - diff --git a/patches/api/0029-EMC-Add-a-BlockHarvestBeehiveEvent.patch b/patches/api/0028-EMC-Add-a-BlockHarvestBeehiveEvent.patch similarity index 96% rename from patches/api/0029-EMC-Add-a-BlockHarvestBeehiveEvent.patch rename to patches/api/0028-EMC-Add-a-BlockHarvestBeehiveEvent.patch index 0376d7d4..2becd101 100644 --- a/patches/api/0029-EMC-Add-a-BlockHarvestBeehiveEvent.patch +++ b/patches/api/0028-EMC-Add-a-BlockHarvestBeehiveEvent.patch @@ -1,4 +1,4 @@ -From 4bb79a5b2ca024f4191b594504368473c8735609 Mon Sep 17 00:00:00 2001 +From aa154abf4e044fe575ea78a064b02dc589a66b0a Mon Sep 17 00:00:00 2001 From: chickeneer Date: Fri, 17 Jan 2020 21:27:29 -0600 Subject: [PATCH] EMC Add a BlockHarvestBeehiveEvent @@ -10,7 +10,7 @@ Subject: [PATCH] EMC Add a BlockHarvestBeehiveEvent diff --git a/src/main/java/com/empireminecraft/customevents/BlockHarvestBeehiveEvent.java b/src/main/java/com/empireminecraft/customevents/BlockHarvestBeehiveEvent.java new file mode 100644 -index 00000000..39cc3a97 +index 000000000..39cc3a973 --- /dev/null +++ b/src/main/java/com/empireminecraft/customevents/BlockHarvestBeehiveEvent.java @@ -0,0 +1,66 @@ diff --git a/patches/api/0030-Kill-AnnotationTest.patch b/patches/api/0029-Kill-AnnotationTest.patch similarity index 99% rename from patches/api/0030-Kill-AnnotationTest.patch rename to patches/api/0029-Kill-AnnotationTest.patch index 9cdd20ac..736e91ae 100644 --- a/patches/api/0030-Kill-AnnotationTest.patch +++ b/patches/api/0029-Kill-AnnotationTest.patch @@ -1,4 +1,4 @@ -From 91aa6130306f7202be435a57c0807fa2b548d50d Mon Sep 17 00:00:00 2001 +From 458c5a023d29bec3d5f8170e84b6f18f46d4d9ff Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 20:10:31 +0100 Subject: [PATCH] Kill AnnotationTest @@ -10,7 +10,7 @@ Subject: [PATCH] Kill AnnotationTest diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java deleted file mode 100644 -index a48be38b..00000000 +index a48be38b1..000000000 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ /dev/null @@ -1,259 +0,0 @@ diff --git a/patches/api/0031-Add-GameProfileLookupEvent.patch b/patches/api/0030-Add-GameProfileLookupEvent.patch similarity index 95% rename from patches/api/0031-Add-GameProfileLookupEvent.patch rename to patches/api/0030-Add-GameProfileLookupEvent.patch index 8a08970c..7ff1e440 100644 --- a/patches/api/0031-Add-GameProfileLookupEvent.patch +++ b/patches/api/0030-Add-GameProfileLookupEvent.patch @@ -1,4 +1,4 @@ -From 1c8f1bf377624c066e0d6300a3f684193eb1d0e9 Mon Sep 17 00:00:00 2001 +From 2aab4c6ddfb3eb6b7e089e96e920ff89d0b5dc66 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 22:21:14 +0100 Subject: [PATCH] Add GameProfileLookupEvent @@ -10,7 +10,7 @@ Subject: [PATCH] Add GameProfileLookupEvent create mode 100644 src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java diff --git a/pom.xml b/pom.xml -index 4bb7efe9..d9fb880f 100644 +index b9d515237..9b9e8c5c3 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,10 @@ @@ -40,7 +40,7 @@ index 4bb7efe9..d9fb880f 100644 fastutil diff --git a/src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java b/src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java new file mode 100644 -index 00000000..4ab5fd19 +index 000000000..4ab5fd191 --- /dev/null +++ b/src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java @@ -0,0 +1,45 @@ diff --git a/patches/api/0032-Add-getLastTickMs-api.patch b/patches/api/0031-Add-getLastTickMs-api.patch similarity index 74% rename from patches/api/0032-Add-getLastTickMs-api.patch rename to patches/api/0031-Add-getLastTickMs-api.patch index 569fad8b..409f3673 100644 --- a/patches/api/0032-Add-getLastTickMs-api.patch +++ b/patches/api/0031-Add-getLastTickMs-api.patch @@ -1,4 +1,4 @@ -From 5b64d1ba79529221d1839ddbaf90ad7b965c1c7d Mon Sep 17 00:00:00 2001 +From 53ceaea3a6c3c4e9d9c7d3391b5d79c8b9e4a9b6 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 21:13:14 +0100 Subject: [PATCH] Add getLastTickMs() api @@ -9,11 +9,11 @@ Subject: [PATCH] Add getLastTickMs() api 2 files changed, 19 insertions(+) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index ea3e5d6fa..c963a5980 100644 +index a9c10228e..53589303e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1690,6 +1690,14 @@ public final class Bukkit { - return server.isStopping(); +@@ -1712,6 +1712,14 @@ public final class Bukkit { + return server.getMobGoals(); } // Paper end + @@ -28,12 +28,12 @@ index ea3e5d6fa..c963a5980 100644 @NotNull public static Server.Spigot spigot() { diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c59c03be6..36740b4ef 100644 +index cf20e7541..771827d80 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1486,4 +1486,15 @@ public interface Server extends PluginMessageRecipient { - */ - boolean isStopping(); +@@ -1504,4 +1504,15 @@ public interface Server extends PluginMessageRecipient { + @NotNull + com.destroystokyo.paper.entity.ai.MobGoals getMobGoals(); // Paper end + + // YAPFA start diff --git a/patches/api/0033-Add-NBT-API-as-first-class-lib.patch b/patches/api/0032-Add-NBT-API-as-first-class-lib.patch similarity index 96% rename from patches/api/0033-Add-NBT-API-as-first-class-lib.patch rename to patches/api/0032-Add-NBT-API-as-first-class-lib.patch index 3c14dd62..f8eebccb 100644 --- a/patches/api/0033-Add-NBT-API-as-first-class-lib.patch +++ b/patches/api/0032-Add-NBT-API-as-first-class-lib.patch @@ -1,4 +1,4 @@ -From 2b1f23977c72ec0992acb920e5ee534bc92b10e2 Mon Sep 17 00:00:00 2001 +From 5d3979b9fb4af8c3ffe6d936c9b1dab1b39a11a3 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 2 Apr 2020 18:49:56 +0200 Subject: [PATCH] Add NBT-API as first-class lib @@ -11,7 +11,7 @@ Subject: [PATCH] Add NBT-API as first-class lib 4 files changed, 56 insertions(+) diff --git a/pom.xml b/pom.xml -index 5d245d153..60ba7dda9 100644 +index 9b9e8c5c3..bd1fc68a6 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,11 @@ @@ -28,7 +28,7 @@ index 5d245d153..60ba7dda9 100644 @@ -158,6 +163,11 @@ asm-commons - 7.3.1 + 8.0.1 + + de.tr7zw @@ -38,7 +38,7 @@ index 5d245d153..60ba7dda9 100644 -@@ -204,6 +214,12 @@ +@@ -228,6 +238,12 @@ ${project.build.directory}/dependency-reduced-pom.xml true diff --git a/patches/api/0034-EMC-Add-ChatColor.getById.patch b/patches/api/0033-EMC-Add-ChatColor.getById.patch similarity index 95% rename from patches/api/0034-EMC-Add-ChatColor.getById.patch rename to patches/api/0033-EMC-Add-ChatColor.getById.patch index 65118cd7..a856ba89 100644 --- a/patches/api/0034-EMC-Add-ChatColor.getById.patch +++ b/patches/api/0033-EMC-Add-ChatColor.getById.patch @@ -1,4 +1,4 @@ -From 96eb8c215c8b77800ac3d3b9959c5ff7b21eb0b3 Mon Sep 17 00:00:00 2001 +From 41f38c79fb6a1154e65cfe587945a25352d2e45c Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 24 Apr 2017 20:27:23 -0400 Subject: [PATCH] EMC Add ChatColor.getById diff --git a/patches/server/0001-Modify-POM.patch b/patches/server/0001-Modify-POM.patch index 4ee130a9..d4f65382 100644 --- a/patches/server/0001-Modify-POM.patch +++ b/patches/server/0001-Modify-POM.patch @@ -1,4 +1,4 @@ -From 260d227668da52f96db63df47dc0f997bc023669 Mon Sep 17 00:00:00 2001 +From 291e44ebd239970d60b1af1f15479372aa1441a5 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 17:08:07 +0100 Subject: [PATCH] Modify POM @@ -8,7 +8,7 @@ Subject: [PATCH] Modify POM 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml -index b8433ddabe..1fae638e93 100644 +index 1ed6a67f62..5e358aa33f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,12 @@ @@ -27,7 +27,7 @@ index b8433ddabe..1fae638e93 100644 UTF-8 -@@ -20,16 +21,16 @@ +@@ -17,16 +18,16 @@ @@ -48,7 +48,7 @@ index b8433ddabe..1fae638e93 100644 ${project.version} compile -@@ -142,15 +143,15 @@ +@@ -152,15 +153,15 @@ diff --git a/patches/server/0002-Brandings.patch b/patches/server/0002-Brandings.patch index aa62dd2f..2f5d5414 100644 --- a/patches/server/0002-Brandings.patch +++ b/patches/server/0002-Brandings.patch @@ -1,4 +1,4 @@ -From 75c753cf6c680afd80777eec8b336a059d5882a3 Mon Sep 17 00:00:00 2001 +From 5a4b45d22b066e2d3709d3eaa53de1a812f41334 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 18:37:34 +0100 Subject: [PATCH] Brandings @@ -53,10 +53,10 @@ index 0000000000..b7a73408ea +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 29ea86f023..2b20a83869 100644 +index f379121b2d..6dd3992674 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1593,7 +1593,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 22 Dec 2012 00:35:15 -0500 Subject: [PATCH] EMC PlayerUseItem Event @@ -10,10 +10,10 @@ This lets us control when an item is consumed and change the item. 2 files changed, 78 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index dfb9421a15..94e3a48bb2 100644 +index 3fc2360a10..5ad0aacf01 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1899,7 +1899,7 @@ public abstract class EntityLiving extends Entity { +@@ -1912,7 +1912,7 @@ public abstract class EntityLiving extends Entity { } } diff --git a/patches/server/0008-EMC-MovedTooQuickly-event.patch b/patches/server/0008-EMC-MovedTooQuickly-event.patch index faeb2672..62934902 100644 --- a/patches/server/0008-EMC-MovedTooQuickly-event.patch +++ b/patches/server/0008-EMC-MovedTooQuickly-event.patch @@ -1,4 +1,4 @@ -From 59f4f8b00fc34dd21624532f62dd86779c71abee Mon Sep 17 00:00:00 2001 +From ca4f212da65a60c57ece0995dc6c1e540e6caf36 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Sep 2013 22:01:47 -0400 Subject: [PATCH] EMC MovedTooQuickly event @@ -9,10 +9,10 @@ also make creative immune to this event 1 file changed, 2 insertions(+) diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 480fda7b1f..4d634032e1 100644 +index e53c629d34..8ac03749f2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1001,9 +1001,11 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1028,9 +1028,11 @@ public class PlayerConnection implements PacketListenerPlayIn { if (d11 - d10 > Math.max(f2, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isExemptPlayer()) { // CraftBukkit end diff --git a/patches/server/0011-EMC-Disable-Snooper.patch b/patches/server/0011-EMC-Disable-Snooper.patch index d6eca7f7..07f0ce9e 100644 --- a/patches/server/0011-EMC-Disable-Snooper.patch +++ b/patches/server/0011-EMC-Disable-Snooper.patch @@ -1,4 +1,4 @@ -From 160693c0618f9e62b71bde6db0e75ce213846b2b Mon Sep 17 00:00:00 2001 +From 6f505028e051515133561088fd09851b1a3656a4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 10 Jan 2014 22:05:59 -0500 Subject: [PATCH] EMC Disable Snooper @@ -9,10 +9,10 @@ What purpose does it provide... 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2b20a83869..ba5e641a9e 100644 +index 6dd3992674..a7adcb9f09 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1248,11 +1248,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 16 Mar 2014 20:44:46 -0400 Subject: [PATCH] EMC EntityKnockbackEvent @@ -31,10 +31,10 @@ index d96c03a1a1..9fc637f96a 100644 public static int getFireAspectEnchantmentLevel(EntityLiving entityliving) { diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 2e186134ea..49433c4618 100644 +index 7df24be46e..8f4bb71b16 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1066,7 +1066,7 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1062,7 +1062,7 @@ public abstract class EntityHuman extends EntityLiving { boolean flag = f2 > 0.9F; boolean flag1 = false; byte b0 = 0; @@ -44,7 +44,7 @@ index 2e186134ea..49433c4618 100644 if (this.isSprinting() && flag) { sendSoundEffect(this, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_PLAYER_ATTACK_KNOCKBACK, this.getSoundCategory(), 1.0F, 1.0F); // Paper - send while respecting visibility diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 1991cee43d..329f36859f 100644 +index 5aca7a9131..eec4343741 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1308,7 +1308,7 @@ public abstract class EntityInsentient extends EntityLiving { diff --git a/patches/server/0017-EMC-Accept-the-EULA.patch b/patches/server/0017-EMC-Accept-the-EULA.patch index 55642eec..eca6228c 100644 --- a/patches/server/0017-EMC-Accept-the-EULA.patch +++ b/patches/server/0017-EMC-Accept-the-EULA.patch @@ -1,4 +1,4 @@ -From 340e04b52f384f9d51e4836b9d83b0bb602b9cfb Mon Sep 17 00:00:00 2001 +From c662a6254e57fbb97c99a1f03d5772e10db9d007 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 5 Sep 2014 23:04:54 -0400 Subject: [PATCH] EMC Accept the EULA @@ -9,10 +9,10 @@ Starlis LLC, the owner of Empire Minecraft, accepts the Minecraft EULA with this 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ba5e641a9e..dd54ea9ff7 100644 +index a7adcb9f09..6e9ff069e3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1452,6 +1452,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 25 Jun 2015 21:00:09 -0400 Subject: [PATCH] EMC ServerReloadEvent @@ -8,10 +8,10 @@ Subject: [PATCH] EMC ServerReloadEvent 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4b27af23..d3a0a917 100644 +index df8bb734ae..35d0b9c4b8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -771,6 +771,7 @@ public final class CraftServer implements Server { +@@ -779,6 +779,7 @@ public final class CraftServer implements Server { @Override public void reload() { org.spigotmc.WatchdogThread.hasStarted = false; // Paper - Disable watchdog early timeout on reload diff --git a/patches/server/0023-EMC-SnowmanThrowSnowballEvent.patch b/patches/server/0023-EMC-SnowmanThrowSnowballEvent.patch index 92ea1076..81de0e51 100644 --- a/patches/server/0023-EMC-SnowmanThrowSnowballEvent.patch +++ b/patches/server/0023-EMC-SnowmanThrowSnowballEvent.patch @@ -1,4 +1,4 @@ -From 5d33e4d03846423ec25dc25e398e089d9625d0fd Mon Sep 17 00:00:00 2001 +From 3d5c18d3c3c7186870ac38e1bbb3f600e23160fa Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 21 Dec 2015 13:33:00 -0500 Subject: [PATCH] EMC SnowmanThrowSnowballEvent @@ -8,10 +8,10 @@ Subject: [PATCH] EMC SnowmanThrowSnowballEvent 1 file changed, 20 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index 07ca1a49..15b0ca94 100644 +index dee55c5dea..9d1cfae9e0 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java -@@ -10,6 +10,25 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity { +@@ -9,6 +9,25 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity { private static final DataWatcherObject b = DataWatcher.a(EntitySnowman.class, DataWatcherRegistry.a); @@ -37,7 +37,7 @@ index 07ca1a49..15b0ca94 100644 public EntitySnowman(EntityTypes entitytypes, World world) { super(entitytypes, world); } -@@ -99,6 +118,7 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity { +@@ -98,6 +117,7 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity { float f1 = MathHelper.sqrt(d1 * d1 + d3 * d3) * 0.2F; entitysnowball.shoot(d1, d2 + (double) f1, d3, 1.6F, 12.0F); diff --git a/patches/server/0026-EMC-EntityAttackedEntityEvent.patch b/patches/server/0026-EMC-EntityAttackedEntityEvent.patch index 33a8122f..3db12710 100644 --- a/patches/server/0026-EMC-EntityAttackedEntityEvent.patch +++ b/patches/server/0026-EMC-EntityAttackedEntityEvent.patch @@ -1,4 +1,4 @@ -From d00582eb5652fd1e400e4e6000cec25b347bbb76 Mon Sep 17 00:00:00 2001 +From 8d7b52f72d216de0f5323929c6d551a317186cff Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 21:42:45 -0500 Subject: [PATCH] EMC EntityAttackedEntityEvent @@ -10,10 +10,10 @@ and that the damage event was not cancelled. 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 75d38bc5d1..306595f5d6 100644 +index ce8d7877ad..b661951ef2 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1000,7 +1000,14 @@ public class CraftEventFactory { +@@ -1008,7 +1008,14 @@ public class CraftEventFactory { callEvent(event); if (!event.isCancelled()) { diff --git a/patches/server/0029-EMC-Default-don-t-use-blockstate-snapshots.patch b/patches/server/0029-EMC-Default-don-t-use-blockstate-snapshots.patch index f2a7c534..960daec2 100644 --- a/patches/server/0029-EMC-Default-don-t-use-blockstate-snapshots.patch +++ b/patches/server/0029-EMC-Default-don-t-use-blockstate-snapshots.patch @@ -1,4 +1,4 @@ -From 2e4696b6c98fd47e500b5cbe388705e76252576c Mon Sep 17 00:00:00 2001 +From eaac0ed4866c7943e2c0dab6c9c5656efb6fafa0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Jun 2018 22:13:44 -0400 Subject: [PATCH] EMC Default don't use blockstate snapshots @@ -8,10 +8,10 @@ Subject: [PATCH] EMC Default don't use blockstate snapshots 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index a25d9d7aa..ebaf4da50 100644 +index 01c524cc01..83a2a87505 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -@@ -312,7 +312,7 @@ public class CraftBlock implements Block { +@@ -309,7 +309,7 @@ public class CraftBlock implements Block { @Override public BlockState getState() { // Paper start - allow disabling the use of snapshots diff --git a/patches/server/0032-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch b/patches/server/0032-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch index e4ce25ad..ee0ca031 100644 --- a/patches/server/0032-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch +++ b/patches/server/0032-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch @@ -1,4 +1,4 @@ -From 9e8b63940cb2097e4a511cba81349ab416ccdffb Mon Sep 17 00:00:00 2001 +From 0ca9a13cafff2b942eb4273cfa024e13bee7dbaa Mon Sep 17 00:00:00 2001 From: willies952002 Date: Fri, 16 Aug 2019 22:18:35 -0400 Subject: [PATCH] EMC Fix Bukkit.createInventory() with type LECTERN @@ -95,7 +95,7 @@ index 6c2b48bdbe..ab1c15e0d1 100644 if (this.world != null) BlockLectern.a(this.getWorld(), this.getPosition(), this.getBlock()); // CraftBukkit } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 211e759a9c..f9fe30f993 100644 +index 63521e8d22..a774968a13 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -31,6 +31,7 @@ import net.minecraft.server.PacketPlayInCloseWindow; @@ -106,7 +106,7 @@ index 211e759a9c..f9fe30f993 100644 import net.minecraft.server.Vec3D; import org.bukkit.GameMode; import org.bukkit.Location; -@@ -318,6 +319,11 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -317,6 +318,11 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { if (craft.getInventory() instanceof ITileInventory) { iinventory = (ITileInventory) craft.getInventory(); } diff --git a/patches/server/0033-EMC-Add-PotionExtinguishFireEvent.patch b/patches/server/0033-EMC-Add-PotionExtinguishFireEvent.patch deleted file mode 100644 index 662c9af7..00000000 --- a/patches/server/0033-EMC-Add-PotionExtinguishFireEvent.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9ac06b092c7559d0c3cbbba44db9d7a4bceb7422 Mon Sep 17 00:00:00 2001 -From: chickeneer -Date: Thu, 28 Nov 2019 20:37:44 -0600 -Subject: [PATCH] EMC Add PotionExtinguishFireEvent - ---- - .../java/net/minecraft/server/EntityPotion.java | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java -index 2f9a73ea..4b82e4c3 100644 ---- a/src/main/java/net/minecraft/server/EntityPotion.java -+++ b/src/main/java/net/minecraft/server/EntityPotion.java -@@ -228,12 +228,17 @@ public class EntityPotion extends EntityProjectile { - private void a(BlockPosition blockposition, EnumDirection enumdirection) { - IBlockData iblockdata = this.world.getType(blockposition); - Block block = iblockdata.getBlock(); -- - if (block == Blocks.FIRE) { -- this.world.douseFire((EntityHuman) null, blockposition.shift(enumdirection), enumdirection.opposite()); -+ // Paper start -+ if (new com.destroystokyo.paper.event.entity.PotionExtinguishFireEvent((org.bukkit.entity.ThrownPotion) this.getBukkitEntity(), world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ())).callEvent()) { -+ this.world.douseFire((EntityHuman) null, blockposition.shift(enumdirection), enumdirection.opposite()); -+ } - } else if (block == Blocks.CAMPFIRE && (Boolean) iblockdata.get(BlockCampfire.b)) { -- this.world.a((EntityHuman) null, 1009, blockposition, 0); -- this.world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(BlockCampfire.b, false)); -+ if (new com.destroystokyo.paper.event.entity.PotionExtinguishFireEvent((org.bukkit.entity.ThrownPotion) this.getBukkitEntity(), world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ())).callEvent()) { -+ this.world.a((EntityHuman) null, 1009, blockposition, 0); -+ this.world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(BlockCampfire.b, false)); -+ } -+ // Paper end - } - - } --- -2.25.1.windows.1 - diff --git a/patches/server/0034-EMC-Add-the-PlayerThrowTridentEvent.patch b/patches/server/0033-EMC-Add-the-PlayerThrowTridentEvent.patch similarity index 92% rename from patches/server/0034-EMC-Add-the-PlayerThrowTridentEvent.patch rename to patches/server/0033-EMC-Add-the-PlayerThrowTridentEvent.patch index f52929be..247c6ca1 100644 --- a/patches/server/0034-EMC-Add-the-PlayerThrowTridentEvent.patch +++ b/patches/server/0033-EMC-Add-the-PlayerThrowTridentEvent.patch @@ -1,4 +1,4 @@ -From 8d4a41a1dccbf27fc900d38d32f983e372f5dd92 Mon Sep 17 00:00:00 2001 +From 426a642033eba18a8717dfec47cd4295ec7e26a7 Mon Sep 17 00:00:00 2001 From: chickeneer Date: Fri, 29 Nov 2019 02:48:17 -0600 Subject: [PATCH] EMC Add the PlayerThrowTridentEvent @@ -8,7 +8,7 @@ Subject: [PATCH] EMC Add the PlayerThrowTridentEvent 1 file changed, 3 insertions(+) diff --git a/src/main/java/net/minecraft/server/ItemTrident.java b/src/main/java/net/minecraft/server/ItemTrident.java -index f571a158..2997c0e9 100644 +index f571a1586d..2997c0e981 100644 --- a/src/main/java/net/minecraft/server/ItemTrident.java +++ b/src/main/java/net/minecraft/server/ItemTrident.java @@ -1,6 +1,8 @@ diff --git a/patches/server/0035-EMC-Add-the-BlockHarvestBeehiveEvent.patch b/patches/server/0034-EMC-Add-the-BlockHarvestBeehiveEvent.patch similarity index 93% rename from patches/server/0035-EMC-Add-the-BlockHarvestBeehiveEvent.patch rename to patches/server/0034-EMC-Add-the-BlockHarvestBeehiveEvent.patch index f318a114..fdb369c7 100644 --- a/patches/server/0035-EMC-Add-the-BlockHarvestBeehiveEvent.patch +++ b/patches/server/0034-EMC-Add-the-BlockHarvestBeehiveEvent.patch @@ -1,4 +1,4 @@ -From f7a5489069fda6adf6956e2153881d1f6e6af444 Mon Sep 17 00:00:00 2001 +From c3407c27ef59f4414f5ca7b393430119132ca10b Mon Sep 17 00:00:00 2001 From: chickeneer Date: Fri, 17 Jan 2020 21:32:10 -0600 Subject: [PATCH] EMC Add the BlockHarvestBeehiveEvent @@ -8,7 +8,7 @@ Subject: [PATCH] EMC Add the BlockHarvestBeehiveEvent 1 file changed, 6 insertions(+) diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java -index 3af686c7..df0501b6 100644 +index 3af686c7f1..df0501b65e 100644 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java @@ -4,6 +4,7 @@ import java.util.Iterator; diff --git a/patches/server/0037-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch b/patches/server/0035-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch similarity index 94% rename from patches/server/0037-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch rename to patches/server/0035-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch index cb736397..7cebaa87 100644 --- a/patches/server/0037-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch +++ b/patches/server/0035-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch @@ -1,4 +1,4 @@ -From 5b5081e34a823b163778744944f703e0bf16c08b Mon Sep 17 00:00:00 2001 +From b722c33c099acbb4a9deb8343639a781adfa1e3e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 4 Jun 2019 15:50:08 -0500 Subject: [PATCH] Purpur Fix 'outdated server' showing in ping before server diff --git a/patches/server/0038-Don-t-save-Fireworks-and-Arrows.patch b/patches/server/0036-Don-t-save-Fireworks-and-Arrows.patch similarity index 84% rename from patches/server/0038-Don-t-save-Fireworks-and-Arrows.patch rename to patches/server/0036-Don-t-save-Fireworks-and-Arrows.patch index 52a8c944..89b05eb8 100644 --- a/patches/server/0038-Don-t-save-Fireworks-and-Arrows.patch +++ b/patches/server/0036-Don-t-save-Fireworks-and-Arrows.patch @@ -1,4 +1,4 @@ -From 64f69f1c740e8d845efadc3b673a8f431774ec58 Mon Sep 17 00:00:00 2001 +From bf4463326998f23d1e3942aacc87eae7c98f3895 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 21:39:58 +0100 Subject: [PATCH] Don't save Fireworks and Arrows @@ -8,10 +8,10 @@ Subject: [PATCH] Don't save Fireworks and Arrows 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index cf3c329f84..9e034293ed 100644 +index 5ed0a949e6..72a0c776f4 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1614,7 +1614,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1613,7 +1613,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } public boolean c(NBTTagCompound nbttagcompound) { diff --git a/patches/server/0036-Purpur-Disable-outdated-build-check.patch b/patches/server/0036-Purpur-Disable-outdated-build-check.patch deleted file mode 100644 index 1a559229..00000000 --- a/patches/server/0036-Purpur-Disable-outdated-build-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 162877ebd799cb0c6b3905fd73655c76c03183e8 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sun, 15 Dec 2019 12:53:59 -0600 -Subject: [PATCH] Purpur 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 6c3a488f4b..d1f24a6e0a 100644 ---- a/src/main/java/org/bukkit/craftbukkit/Main.java -+++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -219,7 +219,7 @@ public class Main { - System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper - } - -- if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { -+ if (false) { // Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { // Purpur - Date buildDate = new SimpleDateFormat("yyyyMMdd-HHmm").parse(Main.class.getPackage().getImplementationVendor()); - - Calendar deadline = Calendar.getInstance(); --- -2.25.1.windows.1 - diff --git a/patches/server/0039-Add-GameProfileLookupEvent.patch b/patches/server/0037-Add-GameProfileLookupEvent.patch similarity index 98% rename from patches/server/0039-Add-GameProfileLookupEvent.patch rename to patches/server/0037-Add-GameProfileLookupEvent.patch index 783926b2..ed36eaa2 100644 --- a/patches/server/0039-Add-GameProfileLookupEvent.patch +++ b/patches/server/0037-Add-GameProfileLookupEvent.patch @@ -1,4 +1,4 @@ -From 26d47218c13c1b533eb613b88fe86bf93112911d Mon Sep 17 00:00:00 2001 +From 25d157fb08edec4ed3dd94c403bc9f2b7773c926 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 22:22:02 +0100 Subject: [PATCH] Add GameProfileLookupEvent diff --git a/patches/server/0040-Add-getLastTickMs-api.patch b/patches/server/0038-Add-getLastTickMs-api.patch similarity index 91% rename from patches/server/0040-Add-getLastTickMs-api.patch rename to patches/server/0038-Add-getLastTickMs-api.patch index 0f3d2ec9..34a8c397 100644 --- a/patches/server/0040-Add-getLastTickMs-api.patch +++ b/patches/server/0038-Add-getLastTickMs-api.patch @@ -1,4 +1,4 @@ -From 04c3df8bcd1dfa73bdd09bd4d5174d6f8023cad8 Mon Sep 17 00:00:00 2001 +From d7e946139230a8c4f15891dd08a01d486ea9e0bd Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 21:13:33 +0100 Subject: [PATCH] Add getLastTickMs() api @@ -10,7 +10,7 @@ Subject: [PATCH] Add getLastTickMs() api 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 18990b4f5a..a160b88612 100644 +index 1be982dcd5..136602ac31 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -893,6 +893,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 5 Mar 2020 22:31:50 +0100 Subject: [PATCH] Add config, yapfa command and basic settings @@ -7,9 +7,9 @@ Subject: [PATCH] Add config, yapfa command and basic settings .../java/de/tr7zw/yapfa/YapfaCommand.java | 129 +++++++++++ src/main/java/de/tr7zw/yapfa/YapfaConfig.java | 219 ++++++++++++++++++ .../net/minecraft/server/DedicatedServer.java | 9 + - .../java/net/minecraft/server/Entity.java | 3 +- + .../java/net/minecraft/server/Entity.java | 4 +- .../net/minecraft/server/EntityLiving.java | 4 + - 5 files changed, 363 insertions(+), 1 deletion(-) + 5 files changed, 364 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/tr7zw/yapfa/YapfaCommand.java create mode 100644 src/main/java/de/tr7zw/yapfa/YapfaConfig.java @@ -396,7 +396,7 @@ index 3c8e231c6a..a2864c9534 100644 this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9e034293ed..e3d58492c1 100644 +index 72a0c776f4..ddb82ef5be 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -753,6 +753,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -407,17 +407,19 @@ index 9e034293ed..e3d58492c1 100644 this.checkBlockCollisions(); } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Checking entity block collision"); -@@ -884,7 +885,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -882,8 +883,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke + private Vec3D e(Vec3D vec3d) { + AxisAlignedBB axisalignedbb = this.getBoundingBox(); VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this); - VoxelShape voxelshape = this.world.getWorldBorder().a(); - Stream stream = VoxelShapes.c(voxelshape, VoxelShapes.a(axisalignedbb.shrink(1.0E-7D)), OperatorBoolean.AND) ? Stream.empty() : Stream.of(voxelshape); ++ + Stream stream = !this.world.getWorldBorder().isInBounds(axisalignedbb) ? Stream.empty() : Stream.of(this.world.getWorldBorder().a()); // Tuinity - optimise voxelshapes - Stream stream1 = this.world.b(this, axisalignedbb.a(vec3d), (Set) ImmutableSet.of()); + Stream stream1 = de.tr7zw.yapfa.YapfaConfig.disableEntityCollisionboxes ? Stream.empty() : this.world.b(this, axisalignedbb.a(vec3d), (Set) ImmutableSet.of()); // YAPFA StreamAccumulator streamaccumulator = new StreamAccumulator<>(Stream.concat(stream1, stream)); Vec3D vec3d1 = vec3d.g() == 0.0D ? vec3d : a(this, vec3d, axisalignedbb, this.world, voxelshapecollision, streamaccumulator); boolean flag = vec3d.x != vec3d1.x; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 36da5fc43d..cc6822d6c5 100644 +index ccd5b56fa8..9e30bb818c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -246,6 +246,7 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0042-Kill-the-vanilla-GameProfiler.patch b/patches/server/0040-Kill-the-vanilla-GameProfiler.patch similarity index 96% rename from patches/server/0042-Kill-the-vanilla-GameProfiler.patch rename to patches/server/0040-Kill-the-vanilla-GameProfiler.patch index d128879e..e598502a 100644 --- a/patches/server/0042-Kill-the-vanilla-GameProfiler.patch +++ b/patches/server/0040-Kill-the-vanilla-GameProfiler.patch @@ -1,4 +1,4 @@ -From 95a3b42c8fa64de17d3ece3ced015830f38c1c03 Mon Sep 17 00:00:00 2001 +From f8803752b7e4cf59bbbcf33c48043e8b81201810 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 23:08:01 +0100 Subject: [PATCH] Kill the vanilla "GameProfiler" @@ -67,7 +67,7 @@ index 0000000000..96a2270a81 + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b7ddbbb6f1..db5214ad22 100644 +index 136602ac31..5305799002 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 22 Mar 2020 19:12:07 +0100 Subject: [PATCH] Rewrite Pathfinder to not use Streams diff --git a/patches/server/0044-Remove-Stream-usage.patch b/patches/server/0042-Remove-Stream-usage.patch similarity index 96% rename from patches/server/0044-Remove-Stream-usage.patch rename to patches/server/0042-Remove-Stream-usage.patch index ca21b272..bc6fd1ff 100644 --- a/patches/server/0044-Remove-Stream-usage.patch +++ b/patches/server/0042-Remove-Stream-usage.patch @@ -1,4 +1,4 @@ -From 1ae0b3425b07a6042a563ebc832e4983d44f49fd Mon Sep 17 00:00:00 2001 +From 4cbe12c279e22aaf675873489fdd2086f068481b Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 23 Mar 2020 18:20:58 +0100 Subject: [PATCH] Remove Stream usage @@ -158,7 +158,7 @@ index e40375b67a..2a5574be3a 100644 entity.enderTeleportTo(entity.locX(), entity.locY() + 1.0D + d0, entity.locZ()); } diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 59d3dc7e81..3d60d34859 100644 +index 07813c55cd..5ec9f04421 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -72,7 +72,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -269,7 +269,7 @@ index f0d7a91fa0..15e2439d69 100644 public Stream c() { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e3d58492c1..e549d44402 100644 +index ddb82ef5be..5d3809d1f8 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -13,6 +13,7 @@ import java.util.Locale; @@ -284,8 +284,8 @@ index e3d58492c1..e549d44402 100644 private Vec3D e(Vec3D vec3d) { AxisAlignedBB axisalignedbb = this.getBoundingBox(); VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this); -- VoxelShape voxelshape = this.world.getWorldBorder().a(); -- Stream stream = VoxelShapes.c(voxelshape, VoxelShapes.a(axisalignedbb.shrink(1.0E-7D)), OperatorBoolean.AND) ? Stream.empty() : Stream.of(voxelshape); +- +- Stream stream = !this.world.getWorldBorder().isInBounds(axisalignedbb) ? Stream.empty() : Stream.of(this.world.getWorldBorder().a()); // Tuinity - optimise voxelshapes - Stream stream1 = de.tr7zw.yapfa.YapfaConfig.disableEntityCollisionboxes ? Stream.empty() : this.world.b(this, axisalignedbb.a(vec3d), (Set) ImmutableSet.of()); // YAPFA - StreamAccumulator streamaccumulator = new StreamAccumulator<>(Stream.concat(stream1, stream)); - Vec3D vec3d1 = vec3d.g() == 0.0D ? vec3d : a(this, vec3d, axisalignedbb, this.world, voxelshapecollision, streamaccumulator); @@ -298,8 +298,8 @@ index e3d58492c1..e549d44402 100644 + //useVoxelShape = VoxelShapes.c(worldBorder, VoxelShapes.a(axisalignedbb.shrink(1.0E-7D)), OperatorBoolean.AND); + vec3d1 = vec3d.g() == 0.0D ? vec3d : aNonStream(this, vec3d, axisalignedbb, this.world, voxelshapecollision, worldBorder); + } else { -+ Stream stream = VoxelShapes.c(worldBorder, VoxelShapes.a(axisalignedbb.shrink(1.0E-7D)), OperatorBoolean.AND) ? Stream.empty() : Stream.of(worldBorder); -+ Stream stream1 = this.world.b(this, axisalignedbb.a(vec3d), (Set) ImmutableSet.of()); ++ Stream stream = !this.world.getWorldBorder().isInBounds(axisalignedbb) ? Stream.empty() : Stream.of(this.world.getWorldBorder().a()); // Tuinity - optimise voxelshapes ++ Stream stream1 = de.tr7zw.yapfa.YapfaConfig.disableEntityCollisionboxes ? Stream.empty() : this.world.b(this, axisalignedbb.a(vec3d), (Set) ImmutableSet.of()); // YAPFA + streamaccumulator = new StreamAccumulator<>(Stream.concat(stream1, stream)); + vec3d1 = vec3d.g() == 0.0D ? vec3d : a(this, vec3d, axisalignedbb, this.world, voxelshapecollision, streamaccumulator); + } @@ -449,10 +449,10 @@ index e3d58492c1..e549d44402 100644 public static Vec3D a(Vec3D vec3d, AxisAlignedBB axisalignedbb, StreamAccumulator streamaccumulator) { double d0 = vec3d.x; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index cc6822d6c5..f53fb3e497 100644 +index 9e30bb818c..1c11480b88 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2649,6 +2649,7 @@ public abstract class EntityLiving extends Entity { +@@ -2662,6 +2662,7 @@ public abstract class EntityLiving extends Entity { this.a(axisalignedbb, this.getBoundingBox()); } @@ -461,7 +461,7 @@ index cc6822d6c5..f53fb3e497 100644 this.world.getMethodProfiler().exit(); } diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java -index 08c83c62df..f9687cdb4c 100644 +index 17e99be012..3d695a9f24 100644 --- a/src/main/java/net/minecraft/server/VoxelShapes.java +++ b/src/main/java/net/minecraft/server/VoxelShapes.java @@ -5,9 +5,12 @@ import com.google.common.math.DoubleMath; @@ -477,7 +477,7 @@ index 08c83c62df..f9687cdb4c 100644 import java.util.stream.Stream; public final class VoxelShapes { -@@ -183,6 +186,106 @@ public final class VoxelShapes { +@@ -200,6 +203,106 @@ public final class VoxelShapes { return d0; } diff --git a/patches/server/0045-Add-option-for-only-players-to-have-collisions-with-.patch b/patches/server/0043-Add-option-for-only-players-to-have-collisions-with-.patch similarity index 92% rename from patches/server/0045-Add-option-for-only-players-to-have-collisions-with-.patch rename to patches/server/0043-Add-option-for-only-players-to-have-collisions-with-.patch index 01809bf1..4ca4bfa5 100644 --- a/patches/server/0045-Add-option-for-only-players-to-have-collisions-with-.patch +++ b/patches/server/0043-Add-option-for-only-players-to-have-collisions-with-.patch @@ -1,4 +1,4 @@ -From 3a72f2f137008ff78a6b0e6c0494b66f58902390 Mon Sep 17 00:00:00 2001 +From 1068bddd31508845d6c0e371d80b505cec8324a8 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 23 Mar 2020 23:11:10 +0100 Subject: [PATCH] Add option for only players to have collisions with Entities @@ -25,10 +25,10 @@ index 9711cbc522..655c4e68f3 100644 } \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a337f75995..c240d4877f 100644 +index 1c11480b88..9ff9e9be2b 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2689,8 +2689,15 @@ public abstract class EntityLiving extends Entity { +@@ -2702,8 +2702,15 @@ public abstract class EntityLiving extends Entity { if (i <= 0 && world.paperConfig.maxCollisionsPerEntity <= 0) { return; } diff --git a/patches/server/0046-Allow-to-change-the-piston-push-limit.patch b/patches/server/0044-Allow-to-change-the-piston-push-limit.patch similarity index 97% rename from patches/server/0046-Allow-to-change-the-piston-push-limit.patch rename to patches/server/0044-Allow-to-change-the-piston-push-limit.patch index cc933182..6190daaa 100644 --- a/patches/server/0046-Allow-to-change-the-piston-push-limit.patch +++ b/patches/server/0044-Allow-to-change-the-piston-push-limit.patch @@ -1,4 +1,4 @@ -From 2e630935a1f1401bbf7ebc40ffdc19b7481ceb1e Mon Sep 17 00:00:00 2001 +From b80888f31bf792b7a9e69f725e08d330fc64c04e Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sun, 29 Mar 2020 00:35:03 +0100 Subject: [PATCH] Allow to change the piston push limit diff --git a/patches/server/0047-Add-option-for-pushable-TileEntities.patch b/patches/server/0045-Add-option-for-pushable-TileEntities.patch similarity index 99% rename from patches/server/0047-Add-option-for-pushable-TileEntities.patch rename to patches/server/0045-Add-option-for-pushable-TileEntities.patch index 89796556..7ae5b784 100644 --- a/patches/server/0047-Add-option-for-pushable-TileEntities.patch +++ b/patches/server/0045-Add-option-for-pushable-TileEntities.patch @@ -1,4 +1,4 @@ -From 780663411a1f3547a242cf3063506435ecf025ce Mon Sep 17 00:00:00 2001 +From c77eb0f5ad7306cc6575de580cfd3897fd874106 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sun, 29 Mar 2020 01:59:27 +0100 Subject: [PATCH] Add option for pushable TileEntities @@ -669,10 +669,10 @@ index 0000000000..b32f231981 +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ab2a5afbb0..7d3ecb5bac 100644 +index 132c5e7dfb..e1de2edd02 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -282,6 +282,13 @@ public class WorldServer extends World { +@@ -275,6 +275,13 @@ public class WorldServer extends World { if (type instanceof ITileEntity) { TileEntity replacement = ((ITileEntity) type).createTile(this); diff --git a/patches/server/0048-Add-NBT-API-as-first-class-lib.patch b/patches/server/0046-Add-NBT-API-as-first-class-lib.patch similarity index 88% rename from patches/server/0048-Add-NBT-API-as-first-class-lib.patch rename to patches/server/0046-Add-NBT-API-as-first-class-lib.patch index 1da90b9d..a74d717c 100644 --- a/patches/server/0048-Add-NBT-API-as-first-class-lib.patch +++ b/patches/server/0046-Add-NBT-API-as-first-class-lib.patch @@ -1,4 +1,4 @@ -From 57c05c2567f033a07afad7357590904394d42c7e Mon Sep 17 00:00:00 2001 +From d532cee5ab2910585e6a2705f952b2738ab7b26e Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 2 Apr 2020 18:49:38 +0200 Subject: [PATCH] Add NBT-API as first-class lib @@ -8,10 +8,10 @@ Subject: [PATCH] Add NBT-API as first-class lib 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml -index 1fae638e93..70add43f4a 100644 +index 5e358aa33f..1802d7f0dc 100644 --- a/pom.xml +++ b/pom.xml -@@ -260,6 +260,10 @@ +@@ -283,6 +283,10 @@ net.minecraft.server net.minecraft.server.v${minecraft_version} diff --git a/patches/server/0049-Player-saving-async-FileIO.patch b/patches/server/0047-Player-saving-async-FileIO.patch similarity index 98% rename from patches/server/0049-Player-saving-async-FileIO.patch rename to patches/server/0047-Player-saving-async-FileIO.patch index bccb0d46..c1eb2d60 100644 --- a/patches/server/0049-Player-saving-async-FileIO.patch +++ b/patches/server/0047-Player-saving-async-FileIO.patch @@ -1,4 +1,4 @@ -From 6ba3b7f40de0eed0e97b8425d794d39d4169083a Mon Sep 17 00:00:00 2001 +From cd3e60148db11a7f500e9b2d257b8689c9a4701b Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sat, 4 Apr 2020 23:23:04 +0200 Subject: [PATCH] Player saving async FileIO @@ -145,7 +145,7 @@ index 79e11eebb7..8d08c91fe6 100644 } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index d8f5910359..eeffa5095a 100644 +index c1e8ff6ab3..db4f628830 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -733,11 +733,23 @@ public abstract class EntityHuman extends EntityLiving { @@ -183,7 +183,7 @@ index d8f5910359..eeffa5095a 100644 nbttagcompound.set("ShoulderEntityLeft", this.getShoulderEntityLeft()); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 9145916d96..22865818db 100644 +index 9786f110c5..54e778815e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -16,6 +16,8 @@ import java.util.Map; @@ -195,7 +195,7 @@ index 9145916d96..22865818db 100644 import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -1164,6 +1166,28 @@ public abstract class PlayerList { +@@ -1184,6 +1186,28 @@ public abstract class PlayerList { if (team != null) scoreboard.removeTeam(team); } // Paper end @@ -224,7 +224,7 @@ index 9145916d96..22865818db 100644 } // Paper end -@@ -1203,13 +1227,13 @@ public abstract class PlayerList { +@@ -1223,13 +1247,13 @@ public abstract class PlayerList { File file = new File(this.server.getWorldServer(DimensionManager.OVERWORLD).getDataManager().getDirectory(), "stats"); File file1 = new File(file, uuid + ".json"); diff --git a/patches/server/0050-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch b/patches/server/0048-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch similarity index 98% rename from patches/server/0050-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch rename to patches/server/0048-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch index e467522b..98ca53fb 100644 --- a/patches/server/0050-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch +++ b/patches/server/0048-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch @@ -1,4 +1,4 @@ -From 4a6265a36dd389b9d334c1ed3fd22975fbfce823 Mon Sep 17 00:00:00 2001 +From 28c06fe583768a03cb7782b358ec1c0b1876eece Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 6 Apr 2020 01:05:08 +0200 Subject: [PATCH] Stop a pathfinder method to call itself more than once @@ -9,7 +9,7 @@ This miiiight help to fix the pathfinder from going nuts. Only time will tell. 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index 4240ca81cb..c71005a91f 100644 +index 61e4dbcd47..f406abd84d 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -96,49 +96,49 @@ public class PathfinderNormal extends PathfinderAbstract { diff --git a/patches/server/0051-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch b/patches/server/0049-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch similarity index 96% rename from patches/server/0051-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch rename to patches/server/0049-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch index 1c505934..e9e08030 100644 --- a/patches/server/0051-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch +++ b/patches/server/0049-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch @@ -1,4 +1,4 @@ -From ae3dd18a459c11331e568f3b511002cc88dce8ac Mon Sep 17 00:00:00 2001 +From 3c3fb4282e51c01730c41b89ec788470b2beac9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:29:08 +0800 diff --git a/patches/server/0052-Akarin-Save-json-list-async.patch b/patches/server/0050-Akarin-Save-json-list-async.patch similarity index 96% rename from patches/server/0052-Akarin-Save-json-list-async.patch rename to patches/server/0050-Akarin-Save-json-list-async.patch index 20f49ecb..06fced51 100644 --- a/patches/server/0052-Akarin-Save-json-list-async.patch +++ b/patches/server/0050-Akarin-Save-json-list-async.patch @@ -1,4 +1,4 @@ -From 2992378863e6b90352f03a92121931bd530e6d23 Mon Sep 17 00:00:00 2001 +From 50a7b4fd80a032af2d0c93d25173f415f213e43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:16:18 +0800 diff --git a/patches/server/0053-Akarin-Cache-hashcode-for-BlockPosition.patch b/patches/server/0051-Akarin-Cache-hashcode-for-BlockPosition.patch similarity index 96% rename from patches/server/0053-Akarin-Cache-hashcode-for-BlockPosition.patch rename to patches/server/0051-Akarin-Cache-hashcode-for-BlockPosition.patch index 21ede8c8..c0dc510b 100644 --- a/patches/server/0053-Akarin-Cache-hashcode-for-BlockPosition.patch +++ b/patches/server/0051-Akarin-Cache-hashcode-for-BlockPosition.patch @@ -1,4 +1,4 @@ -From 44cd6caaed4edfa0a597093669030350f45fbada Mon Sep 17 00:00:00 2001 +From 45f26767c05e5218540a06cc13e92d09f27b0cf1 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 04:28:25 +0700 Subject: [PATCH] Akarin Cache hashcode for BlockPosition @@ -43,7 +43,7 @@ index c439a8d019..cc18560431 100644 public int compareTo(BaseBlockPosition baseblockposition) { return this.getY() == baseblockposition.getY() ? (this.getZ() == baseblockposition.getZ() ? this.getX() - baseblockposition.getX() : this.getZ() - baseblockposition.getZ()) : this.getY() - baseblockposition.getY(); diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 3d60d34859..411b66f693 100644 +index 5ec9f04421..4c040297ff 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -440,6 +440,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali diff --git a/patches/server/0054-Akarin-Optimize-door-interact-with-pathfinding.patch b/patches/server/0052-Akarin-Optimize-door-interact-with-pathfinding.patch similarity index 99% rename from patches/server/0054-Akarin-Optimize-door-interact-with-pathfinding.patch rename to patches/server/0052-Akarin-Optimize-door-interact-with-pathfinding.patch index 9ca8ecc6..59ae035f 100644 --- a/patches/server/0054-Akarin-Optimize-door-interact-with-pathfinding.patch +++ b/patches/server/0052-Akarin-Optimize-door-interact-with-pathfinding.patch @@ -1,4 +1,4 @@ -From a0b270da01695d6c3b1368d6c3ce7fdf884aba2a Mon Sep 17 00:00:00 2001 +From 7d9dbeec19b1eaddc1e4e70b4e8920d93095cf3a Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 03:51:50 +0700 Subject: [PATCH] Akarin Optimize door interact with pathfinding diff --git a/patches/server/0055-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch b/patches/server/0053-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch similarity index 96% rename from patches/server/0055-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch rename to patches/server/0053-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch index 740ac7bb..a3d87e6b 100644 --- a/patches/server/0055-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch +++ b/patches/server/0053-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch @@ -1,4 +1,4 @@ -From edba04e37814d1cf5e9f49ceded7f8b0a8efe142 Mon Sep 17 00:00:00 2001 +From d3722a3415f461f815260767cf19a3b9bf9ef13c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 21 Feb 2020 17:04:51 -0600 Subject: [PATCH] Purpur MC-125757 Fix - Always increment arrow despawn counter diff --git a/patches/server/0056-Purpur-Skip-events-if-there-s-no-listeners.patch b/patches/server/0054-Purpur-Skip-events-if-there-s-no-listeners.patch similarity index 74% rename from patches/server/0056-Purpur-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0054-Purpur-Skip-events-if-there-s-no-listeners.patch index c900cdde..b3576acd 100644 --- a/patches/server/0056-Purpur-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0054-Purpur-Skip-events-if-there-s-no-listeners.patch @@ -1,4 +1,4 @@ -From 31e7d39e6df8dc1a1d03917440b550320637140f Mon Sep 17 00:00:00 2001 +From f8d62246c260c587cb856a3e4dff216d8420d3ee Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 Apr 2020 03:07:59 -0500 Subject: [PATCH] Purpur Skip events if there's no listeners @@ -8,18 +8,18 @@ Subject: [PATCH] Purpur Skip events if there's no listeners 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 2414b0a552..d31d491381 100644 +index 2d512aa4f9..2c8ef6dd6c 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java -@@ -273,6 +273,7 @@ public class CommandDispatcher { +@@ -274,6 +274,7 @@ public class CommandDispatcher { } private void runSync(EntityPlayer entityplayer, Collection bukkit, RootCommandNode rootcommandnode) { + if (PlayerCommandSendEvent.getHandlerList().getRegisteredListeners().length > 0) { // Purpur - skip all this crap if there's nothing listening // Paper end - Async command map building + new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent(entityplayer.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper PlayerCommandSendEvent event = new PlayerCommandSendEvent(entityplayer.getBukkitEntity(), new LinkedHashSet<>(bukkit)); - event.getPlayer().getServer().getPluginManager().callEvent(event); -@@ -284,6 +285,7 @@ public class CommandDispatcher { +@@ -286,6 +287,7 @@ public class CommandDispatcher { } } // CraftBukkit end diff --git a/patches/server/0057-Purpur-Add-more-timings-timers.patch b/patches/server/0055-Purpur-Add-more-timings-timers.patch similarity index 93% rename from patches/server/0057-Purpur-Add-more-timings-timers.patch rename to patches/server/0055-Purpur-Add-more-timings-timers.patch index 9c085d09..b319f55d 100644 --- a/patches/server/0057-Purpur-Add-more-timings-timers.patch +++ b/patches/server/0055-Purpur-Add-more-timings-timers.patch @@ -1,4 +1,4 @@ -From 06cdc62ab432d4c593ef55fe503c0286e2f3cb69 Mon Sep 17 00:00:00 2001 +From 48c1f65d7ee60e9ee875f754d854bcb8b5cbbf91 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Tue, 21 Apr 2020 15:49:52 +0200 Subject: [PATCH] Purpur Add more timings timers @@ -12,7 +12,7 @@ Subject: [PATCH] Purpur Add more timings timers 5 files changed, 57 insertions(+), 1 deletion(-) diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index cfbcb6b6d9..15f9d2eaf1 100644 +index fdb135fa3f..00423cc3af 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -45,6 +45,28 @@ public final class MinecraftTimings { @@ -45,7 +45,7 @@ index cfbcb6b6d9..15f9d2eaf1 100644 private MinecraftTimings() {} diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 329f36859f..25fe07b974 100644 +index eec4343741..916deddd7e 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -677,21 +677,32 @@ public abstract class EntityInsentient extends EntityLiving { @@ -90,10 +90,10 @@ index 329f36859f..25fe07b974 100644 this.K(); } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 58de79e966..99f62f11cb 100644 +index 9ff9e9be2b..418fe5909d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2400,7 +2400,11 @@ public abstract class EntityLiving extends Entity { +@@ -2413,7 +2413,11 @@ public abstract class EntityLiving extends Entity { } } @@ -106,7 +106,7 @@ index 58de79e966..99f62f11cb 100644 double d0 = this.locX() - this.lastX; double d1 = this.locZ() - this.lastZ; float f = (float) (d0 * d0 + d1 * d1); -@@ -2607,18 +2611,23 @@ public abstract class EntityLiving extends Entity { +@@ -2620,18 +2624,23 @@ public abstract class EntityLiving extends Entity { this.setMot(d4, d5, d6); this.world.getMethodProfiler().enter("ai"); @@ -130,7 +130,7 @@ index 58de79e966..99f62f11cb 100644 if (this.jumping) { if (this.N > 0.0D && (!this.onGround || this.N > 0.4D)) { this.c(TagsFluid.WATER); -@@ -2633,21 +2642,26 @@ public abstract class EntityLiving extends Entity { +@@ -2646,21 +2655,26 @@ public abstract class EntityLiving extends Entity { } else { this.jumpTicks = 0; } @@ -158,10 +158,10 @@ index 58de79e966..99f62f11cb 100644 if(!de.tr7zw.yapfa.YapfaConfig.disableEntityCollisions) // YAPFA this.collideNearby(); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java -index 90319909e5..cb12d292cd 100644 +index a68fc11ec6..95dde66531 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java -@@ -77,6 +77,7 @@ public class PathfinderGoalSelector { +@@ -78,6 +78,7 @@ public class PathfinderGoalSelector { private static final PathfinderGoal.Type[] PATHFINDER_GOAL_TYPES = PathfinderGoal.Type.values(); // Paper - remove streams from pathfindergoalselector public void doTick() { @@ -169,7 +169,7 @@ index 90319909e5..cb12d292cd 100644 this.e.enter("goalCleanup"); // Paper start - remove streams from pathfindergoalselector for (Iterator iterator = this.d.iterator(); iterator.hasNext();) { -@@ -96,8 +97,10 @@ public class PathfinderGoalSelector { +@@ -97,8 +98,10 @@ public class PathfinderGoalSelector { } }); @@ -180,7 +180,7 @@ index 90319909e5..cb12d292cd 100644 // Paper start - remove streams from pathfindergoalselector goal_update_loop: for (Iterator iterator = this.d.iterator(); iterator.hasNext();) { PathfinderGoalWrapped wrappedGoal = iterator.next(); -@@ -140,8 +143,10 @@ public class PathfinderGoalSelector { +@@ -141,8 +144,10 @@ public class PathfinderGoalSelector { wrappedGoal.c(); } // Paper end - remove streams from pathfindergoalselector @@ -191,7 +191,7 @@ index 90319909e5..cb12d292cd 100644 // Paper start - remove streams from pathfindergoalselector for (Iterator iterator = this.d.iterator(); iterator.hasNext();) { PathfinderGoalWrapped wrappedGoal = iterator.next(); -@@ -150,6 +155,7 @@ public class PathfinderGoalSelector { +@@ -151,6 +156,7 @@ public class PathfinderGoalSelector { } } // Paper end - remove streams from pathfindergoalselector @@ -200,10 +200,10 @@ index 90319909e5..cb12d292cd 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3aa9cf5269..84ddd78fdd 100644 +index e1de2edd02..63e23a840b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -878,7 +878,9 @@ public class WorldServer extends World { +@@ -871,7 +871,9 @@ public class WorldServer extends World { return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString(); }); gameprofilerfiller.c("tickPassenger"); diff --git a/patches/server/0058-Modify-default-configs.patch b/patches/server/0056-Modify-default-configs.patch similarity index 90% rename from patches/server/0058-Modify-default-configs.patch rename to patches/server/0056-Modify-default-configs.patch index 0bb92ce8..7288c2e0 100644 --- a/patches/server/0058-Modify-default-configs.patch +++ b/patches/server/0056-Modify-default-configs.patch @@ -1,4 +1,4 @@ -From 9598fc9d72b633f2f49a52fd4941abe161ff232f Mon Sep 17 00:00:00 2001 +From 6c1c0d60a9245c1ba1d00c1ecd680d3941c2ad11 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Tue, 21 Apr 2020 16:14:10 +0200 Subject: [PATCH] Modify default configs @@ -9,7 +9,7 @@ Subject: [PATCH] Modify default configs 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 1c4cd36351..f3439fb4ed 100644 +index e0d7832c3a..fd3e4dcb7d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -202,7 +202,7 @@ public class PaperConfig { @@ -22,10 +22,10 @@ index 1c4cd36351..f3439fb4ed 100644 TimingsManager.privacy = getBoolean("timings.server-name-privacy", false); TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses")); diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index fc189ebc96..b1e2e9b50b 100644 +index 5c8a946d5c..4f9c4651d0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -662,7 +662,7 @@ public class PaperWorldConfig { +@@ -650,7 +650,7 @@ public class PaperWorldConfig { } public boolean cooldownHopperWhenFull = true;