diff --git a/patches/api/0001-Tuinity-API-Changes.patch b/patches/api/0001-Tuinity-API-Changes.patch index 97d0b7100..40aeb6922 100644 --- a/patches/api/0001-Tuinity-API-Changes.patch +++ b/patches/api/0001-Tuinity-API-Changes.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f2fbdecec6275fbf7f9a2ce55f73eb583350390f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 14 Dec 2018 21:52:29 -0800 Subject: [PATCH] Tuinity API Changes @@ -8,7 +8,7 @@ Tuinity config API to retrieve raw YamlConfiguration + timing exports diff --git a/pom.xml b/pom.xml -index 1c33b1f4d..4516ba097 100644 +index 1c33b1f4d2366116dd45478b8ad9cdb51fd6bb57..4516ba097e8afc3e422efc368311fa66e967c05a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,18 +3,18 @@ @@ -37,7 +37,7 @@ index 1c33b1f4d..4516ba097 100644 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 3e6331807..7a51edbde 100644 +index 3e6331807f2c411cef3c2774a503f162685e8b46..7a51edbde474bf610cb5928de4b1bbe2edf34638 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1475,6 +1475,14 @@ public interface Server extends PluginMessageRecipient { diff --git a/patches/api/0002-Rebrand.patch b/patches/api/0002-Rebrand.patch index c5487ec0b..2237c197d 100644 --- a/patches/api/0002-Rebrand.patch +++ b/patches/api/0002-Rebrand.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 56e8f8234be0fc23f98ea925470c83510b24d012 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 00:57:16 -0500 Subject: [PATCH] Rebrand diff --git a/pom.xml b/pom.xml -index 4516ba09..f0696d8c 100644 +index 4516ba097e8afc3e422efc368311fa66e967c05a..f0696d8c1dede705f6dd3fd0162864dfd42d2fdf 100644 --- a/pom.xml +++ b/pom.xml @@ -1,20 +1,19 @@ diff --git a/patches/api/0003-Purpur-config-files.patch b/patches/api/0003-Purpur-config-files.patch index 7de9f146d..4f217ab7a 100644 --- a/patches/api/0003-Purpur-config-files.patch +++ b/patches/api/0003-Purpur-config-files.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a61156e64244220d6eaa4fa713a6c0cce8fccb22 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 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 7a51edbde..49343ce93 100644 +index 7a51edbde474bf610cb5928de4b1bbe2edf34638..49343ce93b1792c668cada267bc45601e91216f4 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1483,6 +1483,18 @@ public interface Server extends PluginMessageRecipient { diff --git a/patches/api/0004-Default-permissions.patch b/patches/api/0004-Default-permissions.patch index 211b78e9b..b954ba1ea 100644 --- a/patches/api/0004-Default-permissions.patch +++ b/patches/api/0004-Default-permissions.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 416cf4be6bda5e362a74f0da1b9b2d2f56c92fcd Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jun 2020 23:32:38 -0500 Subject: [PATCH] Default permissions diff --git a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/util/permissions/CommandPermissions.java -index 7763d6101..d5a42707d 100644 +index 7763d6101ac61900db1e2310966b99584539fd0e..d5a42707d365ffd72532bbb1a59a1ca7145f9918 100644 --- a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java +++ b/src/main/java/org/bukkit/util/permissions/CommandPermissions.java @@ -18,6 +18,7 @@ public final class CommandPermissions { @@ -17,7 +17,7 @@ index 7763d6101..d5a42707d 100644 commands.recalculatePermissibles(); return commands; diff --git a/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java b/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java -index e1a4ddf2c..8e481e381 100644 +index e1a4ddf2c07cdd242fa8054a0152522fe4039e85..8e481e3815f5645ee92f0d229e5ff25c8fc9a6c2 100644 --- a/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java +++ b/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java @@ -89,6 +89,8 @@ public final class DefaultPermissions { @@ -31,7 +31,7 @@ index e1a4ddf2c..8e481e381 100644 } diff --git a/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java new file mode 100644 -index 000000000..deedffb4a +index 0000000000000000000000000000000000000000..deedffb4aca00a9ff27a47a09ec7087e5566ad29 --- /dev/null +++ b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java @@ -0,0 +1,76 @@ diff --git a/patches/api/0005-Allow-inventory-resizing.patch b/patches/api/0005-Allow-inventory-resizing.patch index 7c0a66ab1..16624f56c 100644 --- a/patches/api/0005-Allow-inventory-resizing.patch +++ b/patches/api/0005-Allow-inventory-resizing.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From ed64c98e404473e194db95e7592f60db21b01ddb 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 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 +index f1e9bc9bc797b7216336d3470e3c696a06f2b21a..2351283df16dac808d77b840aa88732d7b28c0a1 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java @@ -132,7 +132,7 @@ public enum InventoryType { diff --git a/patches/api/0006-Advancement-API.patch b/patches/api/0006-Advancement-API.patch index 8e4d7648d..5aff7823f 100644 --- a/patches/api/0006-Advancement-API.patch +++ b/patches/api/0006-Advancement-API.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 52ac9f197f62948ab3a52a8db98be41dd4b12031 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 31 May 2019 21:24:21 -0500 Subject: [PATCH] Advancement API diff --git a/src/main/java/org/bukkit/advancement/Advancement.java b/src/main/java/org/bukkit/advancement/Advancement.java -index 7c500997..432caadb 100644 +index 7c5009974ac8d64d0e738e60cec45acb0d4ca89a..432caadba1b08bb94cdb4ccf552e42400e0db338 100644 --- a/src/main/java/org/bukkit/advancement/Advancement.java +++ b/src/main/java/org/bukkit/advancement/Advancement.java @@ -3,6 +3,7 @@ package org.bukkit.advancement; @@ -31,7 +31,7 @@ index 7c500997..432caadb 100644 } diff --git a/src/main/java/org/bukkit/advancement/AdvancementDisplay.java b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java new file mode 100644 -index 00000000..bca3d112 +index 0000000000000000000000000000000000000000..bca3d112e2397b26ba6ccb6cd41e406caae27c5c --- /dev/null +++ b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java @@ -0,0 +1,53 @@ @@ -90,7 +90,7 @@ index 00000000..bca3d112 +} diff --git a/src/main/java/org/bukkit/advancement/FrameType.java b/src/main/java/org/bukkit/advancement/FrameType.java new file mode 100644 -index 00000000..d1757f3d +index 0000000000000000000000000000000000000000..d1757f3d456ff9efce26ce8baa1d16d896908cc2 --- /dev/null +++ b/src/main/java/org/bukkit/advancement/FrameType.java @@ -0,0 +1,27 @@ diff --git a/patches/api/0007-Llama-API.patch b/patches/api/0007-Llama-API.patch index e06445aef..75f098b63 100644 --- a/patches/api/0007-Llama-API.patch +++ b/patches/api/0007-Llama-API.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 18e8170fca46943eea61fb389234ff02f5b3327e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 22:50:05 -0500 Subject: [PATCH] Llama API @@ -6,7 +6,7 @@ Subject: [PATCH] Llama API 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 -index 00000000..6e68c139 +index 0000000000000000000000000000000000000000..6e68c1399bf30eeef6ce0385867f0cf258698eae --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java @@ -0,0 +1,61 @@ @@ -73,7 +73,7 @@ index 00000000..6e68c139 +} diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java new file mode 100644 -index 00000000..ec8d978c +index 0000000000000000000000000000000000000000..ec8d978c22835e2789ebaaeddf0d13588ed1122a --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java @@ -0,0 +1,34 @@ @@ -112,7 +112,7 @@ index 00000000..ec8d978c + } +} diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java -index d23226cc..1ef9479c 100644 +index d23226ccb0f6c25028f000ce31346cd0a8898e6a..1ef9479c962b3f4f6fed46671a1209c34040d16d 100644 --- a/src/main/java/org/bukkit/entity/Llama.java +++ b/src/main/java/org/bukkit/entity/Llama.java @@ -3,6 +3,7 @@ package org.bukkit.entity; diff --git a/patches/api/0008-AFK-API.patch b/patches/api/0008-AFK-API.patch index 914ad9e89..2e42e9012 100644 --- a/patches/api/0008-AFK-API.patch +++ b/patches/api/0008-AFK-API.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 190c76efc968900c45c0f993ec8e950f8f309c78 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 10 Aug 2019 22:19:56 -0500 Subject: [PATCH] AFK API @@ -6,7 +6,7 @@ Subject: [PATCH] AFK API 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 -index 000000000..0c8b3e5e4 +index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862bd9fc4be --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java @@ -0,0 +1,70 @@ @@ -81,7 +81,7 @@ index 000000000..0c8b3e5e4 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a23c08c48..bf4699c40 100644 +index a23c08c48ec627147d94ab4bf4fdf4dae1edeaca..bf4699c405447d07e9a4b70522c7a7c944677f74 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1925,4 +1925,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0009-Bring-back-server-name.patch b/patches/api/0009-Bring-back-server-name.patch index fc5a704c3..d894c7d30 100644 --- a/patches/api/0009-Bring-back-server-name.patch +++ b/patches/api/0009-Bring-back-server-name.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From b1a81022dae6b04d2d903dc8b580c01614f29fd3 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 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 464b2161f..55a0590cc 100644 +index 464b2161f42a9a3969336820bc793274f4d6e942..55a0590cc2a045d341824a37425195927aa3626b 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1808,4 +1808,15 @@ public final class Bukkit { @@ -25,7 +25,7 @@ index 464b2161f..55a0590cc 100644 + // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 49343ce93..69c1cbdf7 100644 +index 49343ce93b1792c668cada267bc45601e91216f4..69c1cbdf7776de5f556acd07b6b3cfedecbc07e0 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1595,4 +1595,13 @@ public interface Server extends PluginMessageRecipient { diff --git a/patches/api/0010-ExecuteCommandEvent.patch b/patches/api/0010-ExecuteCommandEvent.patch index fc931e900..05f31f155 100644 --- a/patches/api/0010-ExecuteCommandEvent.patch +++ b/patches/api/0010-ExecuteCommandEvent.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 2b8cdc9445260c40183fb54297c2870399ea4fb0 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 31 May 2019 00:08:28 -0500 Subject: [PATCH] ExecuteCommandEvent @@ -6,7 +6,7 @@ Subject: [PATCH] ExecuteCommandEvent 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 -index 00000000..3250bd4d +index 0000000000000000000000000000000000000000..3250bd4dc29a0cf79b08833d95a3321d1a6733f6 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java @@ -0,0 +1,130 @@ @@ -141,7 +141,7 @@ index 00000000..3250bd4d + } +} diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index 460fda05..1e0eb099 100644 +index 460fda05a62b12db2edcfb7ea8b2a5dd8e4b110d..1e0eb099933dded131d3c4db8f3cca2b6ed8e064 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -147,6 +147,19 @@ public class SimpleCommandMap implements CommandMap { diff --git a/patches/api/0011-LivingEntity-safeFallDistance.patch b/patches/api/0011-LivingEntity-safeFallDistance.patch index f14d29382..c019265a0 100644 --- a/patches/api/0011-LivingEntity-safeFallDistance.patch +++ b/patches/api/0011-LivingEntity-safeFallDistance.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a8d1bb0a4857672338ba7c79cbbaceb147479330 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 May 2019 12:58:19 -0500 Subject: [PATCH] LivingEntity safeFallDistance diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index e535750d0..156df8cf2 100644 +index e535750d01a6c1bf4b1fe94df518166213da9b08..156df8cf25d1ee07988623fe0a8d87b652390b3b 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -836,4 +836,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0012-Lagging-threshold.patch b/patches/api/0012-Lagging-threshold.patch index 29e3c3de7..7928d2889 100644 --- a/patches/api/0012-Lagging-threshold.patch +++ b/patches/api/0012-Lagging-threshold.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 0435cf4bb137bc03776a7dc41c00193888883fb6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 10:07:24 -0500 Subject: [PATCH] Lagging threshold diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 55a0590cc..39e00f922 100644 +index 55a0590cc2a045d341824a37425195927aa3626b..39e00f922414504a4faa7a183d356d574567a43d 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1818,5 +1818,14 @@ public final class Bukkit { @@ -24,7 +24,7 @@ index 55a0590cc..39e00f922 100644 // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 69c1cbdf7..237b00389 100644 +index 69c1cbdf7776de5f556acd07b6b3cfedecbc07e0..237b00389c98685cc316ce61c1e8318f78b4bca6 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1603,5 +1603,12 @@ public interface Server extends PluginMessageRecipient { diff --git a/patches/api/0013-ItemFactory-getMonsterEgg.patch b/patches/api/0013-ItemFactory-getMonsterEgg.patch index 8832dc412..a8e5f1dfb 100644 --- a/patches/api/0013-ItemFactory-getMonsterEgg.patch +++ b/patches/api/0013-ItemFactory-getMonsterEgg.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 33d64f1d57160c6aa02c740b192cc02ca803c7d1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jul 2019 16:37:04 -0500 Subject: [PATCH] ItemFactory#getMonsterEgg diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 3f23927e..23d55f75 100644 +index 3f23927e58e0ccf8cf04d4beb4d83346e3f84730..23d55f756b2bb5a557bfae102d7039d8394fbe69 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -215,4 +215,15 @@ public interface ItemFactory { diff --git a/patches/api/0014-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0014-PlayerSetSpawnerTypeWithEggEvent.patch index 2c595bf1d..a7e54ad12 100644 --- a/patches/api/0014-PlayerSetSpawnerTypeWithEggEvent.patch +++ b/patches/api/0014-PlayerSetSpawnerTypeWithEggEvent.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 479fce9b01d8695739e3a53cd7657cb866de3305 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jul 2019 18:21:15 -0500 Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent 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 -index 00000000..c050b75e +index 0000000000000000000000000000000000000000..c050b75e9a11ac728868fe95e3f89e6b99de6ad2 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java @@ -0,0 +1,85 @@ diff --git a/patches/api/0015-EMC-MonsterEggSpawnEvent.patch b/patches/api/0015-EMC-MonsterEggSpawnEvent.patch index 7436a90e5..0a4c59d69 100644 --- a/patches/api/0015-EMC-MonsterEggSpawnEvent.patch +++ b/patches/api/0015-EMC-MonsterEggSpawnEvent.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f193571119892253a46e723bdea57284165b9d92 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 21 Nov 2016 17:02:11 -0500 Subject: [PATCH] EMC - MonsterEggSpawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EMC - MonsterEggSpawnEvent 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 -index 00000000..983d6723 +index 0000000000000000000000000000000000000000..983d67234b15c83c3785d9fbc191da70cf67ccab --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java @@ -0,0 +1,67 @@ diff --git a/patches/api/0016-Villager-resetOffers.patch b/patches/api/0016-Villager-resetOffers.patch index d20d5d8fd..4493afc05 100644 --- a/patches/api/0016-Villager-resetOffers.patch +++ b/patches/api/0016-Villager-resetOffers.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 133d1fb21b264bdd97c21e734c23c38d136256fc Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 7 Oct 2019 00:15:28 -0500 Subject: [PATCH] Villager#resetOffers diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java -index c8777a47..ed703af4 100644 +index c8777a476e38ef5e72b6709761990a339eb43d2b..ed703af452cd7db5e47608b4ff6ec049f76ed03a 100644 --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java @@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager { diff --git a/patches/api/0017-PaperPR-PlayerItemCooldownEvent.patch b/patches/api/0017-PaperPR-PlayerItemCooldownEvent.patch index e7d5dc4ae..74ec8eb16 100644 --- a/patches/api/0017-PaperPR-PlayerItemCooldownEvent.patch +++ b/patches/api/0017-PaperPR-PlayerItemCooldownEvent.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 06d0be867ff7910b0a8a0d9f9ac6cb94edf7e94c Mon Sep 17 00:00:00 2001 From: KennyTV Date: Mon, 20 Apr 2020 13:57:13 +0200 Subject: [PATCH] PaperPR - PlayerItemCooldownEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PaperPR - PlayerItemCooldownEvent 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 -index 000000000..2002909f3 +index 0000000000000000000000000000000000000000..2002909f30d2bd833dc13cf09b0bc4bdae0d6757 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java @@ -0,0 +1,77 @@ diff --git a/patches/api/0018-EntityMoveEvent.patch b/patches/api/0018-EntityMoveEvent.patch index 443ae36dd..d5d55948f 100644 --- a/patches/api/0018-EntityMoveEvent.patch +++ b/patches/api/0018-EntityMoveEvent.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d26ced2c3f87ed3988795aaf2964ff4747912252 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 11 Feb 2020 21:56:38 -0600 Subject: [PATCH] EntityMoveEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityMoveEvent 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 -index 000000000..c48c525b8 +index 0000000000000000000000000000000000000000..c48c525b8ee527a5766ac679619fd88956002d64 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java @@ -0,0 +1,95 @@ diff --git a/patches/api/0019-Player-invulnerabilities.patch b/patches/api/0019-Player-invulnerabilities.patch index f851938c5..d4ac2ad29 100644 --- a/patches/api/0019-Player-invulnerabilities.patch +++ b/patches/api/0019-Player-invulnerabilities.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 495e754ad060dbee0bb249b6a600b2ca25cba144 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 2 May 2020 20:55:31 -0500 Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index bf4699c40..18b5f84a1 100644 +index bf4699c405447d07e9a4b70522c7a7c944677f74..18b5f84a1d7567e17d8baa9abb889a1f7cc7f5b8 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1945,5 +1945,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0020-Anvil-API.patch b/patches/api/0020-Anvil-API.patch index c81549703..89a680b10 100644 --- a/patches/api/0020-Anvil-API.patch +++ b/patches/api/0020-Anvil-API.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 3c8c5397805dcd08cd9f8be2242ce188bd3bba77 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 19 Apr 2020 00:25:09 -0500 Subject: [PATCH] Anvil API @@ -6,7 +6,7 @@ Subject: [PATCH] Anvil API 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 -index 000000000..85663c0a4 +index 0000000000000000000000000000000000000000..85663c0a44695f7b7f01a68693cac3d99f4b56ca --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java @@ -0,0 +1,52 @@ @@ -64,7 +64,7 @@ index 000000000..85663c0a4 +} diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java new file mode 100644 -index 000000000..2717ad82c +index 0000000000000000000000000000000000000000..2717ad82ccc0d39c5a69b8890303c245e9a17f83 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java @@ -0,0 +1,35 @@ @@ -104,7 +104,7 @@ index 000000000..2717ad82c + } +} diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java -index b95e563b5..435026e53 100644 +index b95e563b5454306a9188ae3295309ee86a756477..435026e533ea9edb8c1800d35c63543ca023a904 100644 --- a/src/main/java/org/bukkit/inventory/AnvilInventory.java +++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java @@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory { diff --git a/patches/api/0021-ItemStack-convenience-methods.patch b/patches/api/0021-ItemStack-convenience-methods.patch index 81bb4b3a2..b58e7331d 100644 --- a/patches/api/0021-ItemStack-convenience-methods.patch +++ b/patches/api/0021-ItemStack-convenience-methods.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 5a74178df3ac9a7eb781b16b71bc14266ee8a01a 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 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 4ba991b79..a2e476f15 100644 +index 4ba991b79f13219182df35b4ce0c5cf57cbd208b..a2e476f154344f9473dd9b48866505448de56d84 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -8645,4 +8645,36 @@ public enum Material implements Keyed { @@ -46,7 +46,7 @@ index 4ba991b79..a2e476f15 100644 + // Purpur end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index ccd81fca2..3fecde7a0 100644 +index ccd81fca25233c2a9c2a8c3f4dda3053d7b2e723..3fecde7a0d2dd45ca090dbcc49e6d85169bda443 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta; diff --git a/patches/api/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/api/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 5676840d5..0f2675da2 100644 --- a/patches/api/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/api/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f201c6dab7d2a3bc8bfa62b3871b03572faa7fb2 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 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 b42091752..83c51bb5e 100644 +index b42091752981a1f309ab350e9a394092cb334824..83c51bb5e09549a8205d27a53ff0102f9439d60a 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -206,4 +206,8 @@ public interface VanillaGoal extends Goal { diff --git a/patches/api/0023-ChatColor-conveniences.patch b/patches/api/0023-ChatColor-conveniences.patch index 858bf3bd1..ac97d64b5 100644 --- a/patches/api/0023-ChatColor-conveniences.patch +++ b/patches/api/0023-ChatColor-conveniences.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 659ec5275805ef5a791c7a1a848ae08d627aeed3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 10 Jul 2020 12:43:25 -0500 Subject: [PATCH] ChatColor conveniences diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java -index 4594701d7..499b222de 100644 +index 4594701d77c5d0f744bece871b98d9f6f73eb5a7..499b222dee1f11d497a29a9a263a5596401ca1eb 100644 --- a/src/main/java/org/bukkit/ChatColor.java +++ b/src/main/java/org/bukkit/ChatColor.java @@ -413,4 +413,30 @@ public enum ChatColor { diff --git a/patches/api/0024-DragonEggPlaceEvent.patch b/patches/api/0024-DragonEggPlaceEvent.patch index e8c31304d..3316c0f59 100644 --- a/patches/api/0024-DragonEggPlaceEvent.patch +++ b/patches/api/0024-DragonEggPlaceEvent.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 628c214a72d629231aa7322791fdb10064aba4b1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 30 Jul 2020 18:15:04 -0500 Subject: [PATCH] DragonEggPlaceEvent @@ -6,7 +6,7 @@ Subject: [PATCH] DragonEggPlaceEvent diff --git a/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java new file mode 100644 -index 000000000..bdabfd2b5 +index 0000000000000000000000000000000000000000..bdabfd2b5f64b0e65c4eb09958282962620cdda2 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java @@ -0,0 +1,47 @@ diff --git a/patches/api/0025-Ridables.patch b/patches/api/0025-Ridables.patch index 8046225c0..22612eae9 100644 --- a/patches/api/0025-Ridables.patch +++ b/patches/api/0025-Ridables.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a26dc694e3e6aad0d7d6fef8a48d4594a5b2c0d2 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 00:57:16 -0500 Subject: [PATCH] Ridables 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 83c51bb5e..177143c97 100644 +index 83c51bb5e09549a8205d27a53ff0102f9439d60a..177143c9764e82981423879ed35625edd25d3ebf 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -209,5 +209,7 @@ public interface VanillaGoal extends Goal { @@ -18,7 +18,7 @@ index 83c51bb5e..177143c97 100644 } diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableMoveEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableMoveEvent.java new file mode 100644 -index 000000000..48e7ac392 +index 0000000000000000000000000000000000000000..48e7ac392fe5efac8a4ce549e31a05ed817417e4 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/entity/RidableMoveEvent.java @@ -0,0 +1,103 @@ @@ -127,7 +127,7 @@ index 000000000..48e7ac392 +} diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java new file mode 100644 -index 000000000..c0ec5a130 +index 0000000000000000000000000000000000000000..c0ec5a130985e8da4cc9e596a6b70503d2550f77 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java @@ -0,0 +1,37 @@ @@ -169,7 +169,7 @@ index 000000000..c0ec5a130 + } +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index ff2e4fc8a..cd209dcfb 100644 +index ff2e4fc8a632453e280f1a6ec05878b0e7fd2a9c..cd209dcfbb81010e916b40d61d0a038c75a6f788 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -696,4 +696,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0026-Configurable-permission-message-upgrades.patch b/patches/api/0026-Configurable-permission-message-upgrades.patch index e097b19e2..64ea95628 100644 --- a/patches/api/0026-Configurable-permission-message-upgrades.patch +++ b/patches/api/0026-Configurable-permission-message-upgrades.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 1be09fcbc1d05ebece230eea39f30536d6232df9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 15 Aug 2020 11:18:27 -0500 Subject: [PATCH] Configurable permission message upgrades @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable permission message upgrades This allows the configurable permission message in paper.yml to be blank and also support newlines diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index c10fc8d23..882c565ac 100644 +index c10fc8d2386301bc2caddcdb1cd18566bcaa8689..882c565ac2be3df976e7bbeb4dc80c9ac474a8b1 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -184,9 +184,13 @@ public abstract class Command { diff --git a/patches/api/0027-LivingEntity-broadcastItemBreak.patch b/patches/api/0027-LivingEntity-broadcastItemBreak.patch index e260fe22e..78d8c4751 100644 --- a/patches/api/0027-LivingEntity-broadcastItemBreak.patch +++ b/patches/api/0027-LivingEntity-broadcastItemBreak.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 2acd70ef868b7a96fb7b75908b5307eee25b0614 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 17 Aug 2020 21:50:32 -0500 Subject: [PATCH] LivingEntity#broadcastItemBreak diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 156df8cf2..d3adc23bb 100644 +index 156df8cf25d1ee07988623fe0a8d87b652390b3b..d3adc23bb34d108d2afa9903988606d2d53f6513 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -851,5 +851,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0028-Item-entity-immunities.patch b/patches/api/0028-Item-entity-immunities.patch index bb5e6013d..40b102878 100644 --- a/patches/api/0028-Item-entity-immunities.patch +++ b/patches/api/0028-Item-entity-immunities.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From acc39a57c8192e5d467809a2b2329e6f34a53148 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 22 Aug 2020 17:42:08 -0500 Subject: [PATCH] Item entity immunities diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index 0ee072645..bc1f3f1c6 100644 +index 0ee072645ecf1bf5feb74de6960947ef76db366e..bc1f3f1c6f7be2e478576740d119c8a36b032912 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -120,4 +120,34 @@ public interface Item extends Entity { diff --git a/patches/api/0029-Spigot-Improve-output-of-plugins-command.patch b/patches/api/0029-Spigot-Improve-output-of-plugins-command.patch index 1383f11af..c93a61e2e 100644 --- a/patches/api/0029-Spigot-Improve-output-of-plugins-command.patch +++ b/patches/api/0029-Spigot-Improve-output-of-plugins-command.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d2860d689484dfb0f5721a2d8e54b6c98a3f9e31 Mon Sep 17 00:00:00 2001 From: Parker Hawke Date: Sat, 27 Jun 2020 18:43:37 -0400 Subject: [PATCH] Spigot - Improve output of plugins command diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -index 1aa58c59e..4974fc518 100644 +index 1aa58c59e1e8738bbdc77752885ff3b18b29de42..4974fc518c3645e6e060ff52e71a47a86d52ec5c 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java @@ -11,6 +11,15 @@ import org.bukkit.ChatColor; diff --git a/patches/api/0030-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/api/0030-Add-option-to-disable-zombie-aggressiveness-towards-.patch index 9c2c37e7f..1133a8634 100644 --- a/patches/api/0030-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/api/0030-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From c4a1b790315a30ccf38227ab5d707fb3e195a1c4 Mon Sep 17 00:00:00 2001 From: nitricspace Date: Wed, 23 Sep 2020 22:14:38 +0100 Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers 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 177143c97..da638f974 100644 +index 177143c9764e82981423879ed35625edd25d3ebf..da638f9745aceebe4f2ca90823308c6879c75ae7 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -211,5 +211,7 @@ public interface VanillaGoal extends Goal { diff --git a/patches/api/0031-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/api/0031-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch index 0b4d73f4f..3988e4176 100644 --- a/patches/api/0031-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch +++ b/patches/api/0031-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a7d4877d4f084fd5f233ea505d671705a9206dc5 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 2 Oct 2020 17:43:24 -0500 Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient diff --git a/src/main/java/org/bukkit/inventory/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java -index 3d325cab6..4dedbdc1c 100644 +index 3d325cab6b106ce8617e321d7a733eca91ba93e5..4dedbdc1cc8b34b73a1a32b35d1985284da6fc08 100644 --- a/src/main/java/org/bukkit/inventory/RecipeChoice.java +++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java @@ -10,6 +10,7 @@ import java.util.function.Predicate; diff --git a/patches/api/0032-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/api/0032-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch index d506c40e7..ea550e81a 100644 --- a/patches/api/0032-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch +++ b/patches/api/0032-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 154bfc56d6ee1ffa72a35d66c2e9018e1fbd07ee Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 24 Nov 2020 04:30:34 -0600 Subject: [PATCH] Add critical hit check to EntityDamagedByEntityEvent diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java -index 869bad740..05fde759b 100644 +index 869bad7405ec7fa67728e90d8b9f2e11b542611f..05fde759bbdf6068f140b4428bbcb355e22d6b28 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java @@ -10,15 +10,28 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/api/0033-Left-handed-API.patch b/patches/api/0033-Left-handed-API.patch index 4d060aa82..799410d12 100644 --- a/patches/api/0033-Left-handed-API.patch +++ b/patches/api/0033-Left-handed-API.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From e8b8cda97f33d19f6c9de0952680ee74b29e7fa4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 30 Nov 2020 06:02:54 -0600 Subject: [PATCH] Left handed API diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index d726453c0..9d4eae5cf 100644 +index d726453c041a980576312b6bee96a07837f37974..9d4eae5cf0bf8d01954db85b431bcdca8490ee8f 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -64,4 +64,20 @@ public interface Mob extends LivingEntity, Lootable { diff --git a/patches/api/0034-Alphabetize-in-game-plugins-list.patch b/patches/api/0034-Alphabetize-in-game-plugins-list.patch index e79a18f14..6d8892c35 100644 --- a/patches/api/0034-Alphabetize-in-game-plugins-list.patch +++ b/patches/api/0034-Alphabetize-in-game-plugins-list.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 3277f0430205ea95ea4072e3734160f8bcd046dc Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 8 Dec 2020 09:48:18 -0600 Subject: [PATCH] Alphabetize in-game /plugins list diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -index 4974fc518..37cc5d7e9 100644 +index 4974fc518c3645e6e060ff52e71a47a86d52ec5c..37cc5d7e9db89e4ef7ab16da1b159bd19134a4ff 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java @@ -2,6 +2,7 @@ package org.bukkit.command.defaults; diff --git a/patches/api/0035-Rabid-Wolf-API.patch b/patches/api/0035-Rabid-Wolf-API.patch index 0df0822ee..b4281837a 100644 --- a/patches/api/0035-Rabid-Wolf-API.patch +++ b/patches/api/0035-Rabid-Wolf-API.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 9819b9491b168b40f7e0ab1e2d8c4b218932cd94 Mon Sep 17 00:00:00 2001 From: Encode42 Date: Tue, 8 Dec 2020 17:15:15 -0500 Subject: [PATCH] Rabid Wolf API 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 da638f974..39f770411 100644 +index da638f9745aceebe4f2ca90823308c6879c75ae7..39f77041133228c4bd4cec2427ad0bae8e739d4a 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -213,5 +213,6 @@ public interface VanillaGoal extends Goal { @@ -16,7 +16,7 @@ index da638f974..39f770411 100644 // Purpur end } diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java -index 0e5decadf..c1fd30fe4 100644 +index 0e5decadf31140d6cb121c298f935ccc12c7a7e7..c1fd30fe4cd4eec11eb8298f059d14584b7dd7ec 100644 --- a/src/main/java/org/bukkit/entity/Wolf.java +++ b/src/main/java/org/bukkit/entity/Wolf.java @@ -39,4 +39,20 @@ public interface Wolf extends Tameable, Sittable { diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index e019d42a3..755a7fdc3 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From ba76ae4d98e820c92f50a81d4c5905cb3f455b9c Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 14 Dec 2018 21:53:58 -0800 Subject: [PATCH] Tuinity Server Changes @@ -420,7 +420,7 @@ This patch also prevents the saving/unloading of POI data when world saving is disabled. diff --git a/pom.xml b/pom.xml -index 80f165291..78c2a8bbc 100644 +index 80f165291385f5f54def1a8e8487b209fb06a4a3..78c2a8bbcc0132f891c8aa545529d20aa0d9eb57 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -520,7 +520,7 @@ index 80f165291..78c2a8bbc 100644 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index 884b59d47..68ab5ccb2 100644 +index 884b59d478aa7de49906520e77866a7949bed19d..68ab5ccb2fcfe1de0503c9336572f28e11832b2d 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -43,6 +43,9 @@ public final class MinecraftTimings { @@ -534,7 +534,7 @@ index 884b59d47..68ab5ccb2 100644 private MinecraftTimings() {} diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index e33e889c2..5dfa06588 100644 +index e33e889c291d37a821a4fbd40d9aac7bb079de0d..5dfa0658838c4801cdf260eae8b98163f729e5af 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -229,7 +229,8 @@ public class TimingsExport extends Thread { @@ -548,7 +548,7 @@ index e33e889c2..5dfa06588 100644 new TimingsExport(listeners, parent, history).start(); diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 03c95b30d..ac7f390cf 100644 +index 03c95b30d8a0557482d39468c058e7966114f824..ac7f390cf0a404daeb80f89326fe1e510292f817 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -585,7 +585,7 @@ public class Metrics { @@ -570,7 +570,7 @@ index 03c95b30d..ac7f390cf 100644 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index ad6b15f40..c9e3a0c87 100644 +index ad6b15f401ce7493a2a247e2a2af23f73ade02ca..c9e3a0c8742caeef85c429861cf4b7f2b470ed51 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -225,8 +225,20 @@ public class PaperCommand extends Command { @@ -604,7 +604,7 @@ index ad6b15f40..c9e3a0c87 100644 } diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 49a38c660..255bbd6e4 100644 +index 49a38c6608b652ff48ef4eaca0dd3ccb1ba570e3..255bbd6e48b95c70fad02ba692c64c7579496827 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -24,8 +24,8 @@ public class PaperVersionFetcher implements VersionFetcher { @@ -635,7 +635,7 @@ index 49a38c660..255bbd6e4 100644 switch (distance) { case -1: diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java -index e7624948e..77df68888 100644 +index e7624948ea4aa1a07d84ed3d295cfe2dd354fd14..77df6888803093ad9527d276033f2ed767b39764 100644 --- a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java @@ -186,6 +186,7 @@ public final class PaperTickList extends TickListServer { // extend to avo @@ -719,7 +719,7 @@ index e7624948e..77df68888 100644 int ret = 0; diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java -index 103576715..e8fdbe7b8 100644 +index 103576715ef6ae4df4b216ae9ae31b6fb1086bd5..e8fdbe7b8d8192a3247d98534e78ede7a7314a91 100644 --- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java +++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java @@ -590,10 +590,11 @@ public class CommandDispatcher { @@ -736,7 +736,7 @@ index 103576715..e8fdbe7b8 100644 } futures[i++] = future; diff --git a/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java b/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java -index cb993ca10..849686f7b 100644 +index cb993ca102402d9c19ea9fa04e5db09c21205896..849686f7b2a8b0044f7cd14c8c2e401e80966462 100644 --- a/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java +++ b/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java @@ -34,10 +34,10 @@ public class BoolArgumentType implements ArgumentType { @@ -753,7 +753,7 @@ index cb993ca10..849686f7b 100644 } return builder.buildFuture(); diff --git a/src/main/java/com/mojang/brigadier/suggestion/SuggestionsBuilder.java b/src/main/java/com/mojang/brigadier/suggestion/SuggestionsBuilder.java -index bc0024adb..0343f6663 100644 +index bc0024adb804ac055a4f8afb7f85d00ec13931e9..0343f6663c450c3f0d9c57d817eef9c979055939 100644 --- a/src/main/java/com/mojang/brigadier/suggestion/SuggestionsBuilder.java +++ b/src/main/java/com/mojang/brigadier/suggestion/SuggestionsBuilder.java @@ -14,9 +14,16 @@ public class SuggestionsBuilder { @@ -774,7 +774,7 @@ index bc0024adb..0343f6663 100644 this.start = start; this.remaining = input.substring(start); diff --git a/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java b/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java -index 772057879..e5db29d4c 100644 +index 7720578796e28d28e8c0c9aa40155cd205c17d54..e5db29d4cadb5702c7d06b0b6e2d05586a652ec8 100644 --- a/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java @@ -20,11 +20,11 @@ import java.util.concurrent.CompletableFuture; @@ -802,7 +802,7 @@ index 772057879..e5db29d4c 100644 return Suggestions.empty(); diff --git a/src/main/java/com/tuinity/tuinity/chunk/ChunkEntitiesByClass.java b/src/main/java/com/tuinity/tuinity/chunk/ChunkEntitiesByClass.java new file mode 100644 -index 000000000..37428f4b9 +index 0000000000000000000000000000000000000000..37428f4b9ae45175fda545e9d8b55cf8a3b8c87b --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/ChunkEntitiesByClass.java @@ -0,0 +1,186 @@ @@ -994,7 +994,7 @@ index 000000000..37428f4b9 +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java b/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java new file mode 100644 -index 000000000..cae06962d +index 0000000000000000000000000000000000000000..cae06962d80cdd00962236891472ba815b0ab8cd --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java @@ -0,0 +1,491 @@ @@ -1492,7 +1492,7 @@ index 000000000..cae06962d \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/chunk/light/BlockStarLightEngine.java b/src/main/java/com/tuinity/tuinity/chunk/light/BlockStarLightEngine.java new file mode 100644 -index 000000000..e7df9dc4b +index 0000000000000000000000000000000000000000..e7df9dc4b82c08aafc0a0bb076d9027c1f7758e2 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/light/BlockStarLightEngine.java @@ -0,0 +1,155 @@ @@ -1653,7 +1653,7 @@ index 000000000..e7df9dc4b +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/light/SWMRNibbleArray.java b/src/main/java/com/tuinity/tuinity/chunk/light/SWMRNibbleArray.java new file mode 100644 -index 000000000..6cae16cc3 +index 0000000000000000000000000000000000000000..6cae16cc32c49d1787b18f3f51788fe4743113bf --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/light/SWMRNibbleArray.java @@ -0,0 +1,196 @@ @@ -1855,7 +1855,7 @@ index 000000000..6cae16cc3 +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/light/SkyStarLightEngine.java b/src/main/java/com/tuinity/tuinity/chunk/light/SkyStarLightEngine.java new file mode 100644 -index 000000000..055f2e1a4 +index 0000000000000000000000000000000000000000..055f2e1a469830294767af8eb733e998d54596a5 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/light/SkyStarLightEngine.java @@ -0,0 +1,365 @@ @@ -2226,7 +2226,7 @@ index 000000000..055f2e1a4 +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/light/StarLightEngine.java b/src/main/java/com/tuinity/tuinity/chunk/light/StarLightEngine.java new file mode 100644 -index 000000000..7fcbfa5c2 +index 0000000000000000000000000000000000000000..7fcbfa5c224426540693424c34a517bda23e6dd1 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/light/StarLightEngine.java @@ -0,0 +1,1014 @@ @@ -3246,7 +3246,7 @@ index 000000000..7fcbfa5c2 +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/light/ThreadedStarLightEngine.java b/src/main/java/com/tuinity/tuinity/chunk/light/ThreadedStarLightEngine.java new file mode 100644 -index 000000000..767831d16 +index 0000000000000000000000000000000000000000..767831d169710388613396fcf8845453ef09f09d --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/light/ThreadedStarLightEngine.java @@ -0,0 +1,181 @@ @@ -3433,7 +3433,7 @@ index 000000000..767831d16 +} diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java new file mode 100644 -index 000000000..42ce3b802 +index 0000000000000000000000000000000000000000..42ce3b80217b574a1852e12f500b366a912e23e2 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java @@ -0,0 +1,381 @@ @@ -3821,7 +3821,7 @@ index 000000000..42ce3b802 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/CachedLists.java b/src/main/java/com/tuinity/tuinity/util/CachedLists.java new file mode 100644 -index 000000000..21e50c75e +index 0000000000000000000000000000000000000000..21e50c75e0bffaa5cc5faf6aa81ae7428caca731 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/CachedLists.java @@ -0,0 +1,74 @@ @@ -3901,7 +3901,7 @@ index 000000000..21e50c75e +} diff --git a/src/main/java/com/tuinity/tuinity/util/IntervalledCounter.java b/src/main/java/com/tuinity/tuinity/util/IntervalledCounter.java new file mode 100644 -index 000000000..d2c7d2c79 +index 0000000000000000000000000000000000000000..d2c7d2c7920324d7207225ed19484e804368489d --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/IntervalledCounter.java @@ -0,0 +1,100 @@ @@ -4007,7 +4007,7 @@ index 000000000..d2c7d2c79 +} diff --git a/src/main/java/com/tuinity/tuinity/util/TickThread.java b/src/main/java/com/tuinity/tuinity/util/TickThread.java new file mode 100644 -index 000000000..08ed24325 +index 0000000000000000000000000000000000000000..08ed243259f052165c6f75aed1d1d65a14219715 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/TickThread.java @@ -0,0 +1,41 @@ @@ -4055,7 +4055,7 @@ index 000000000..08ed24325 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java new file mode 100644 -index 000000000..be408aebb +index 0000000000000000000000000000000000000000..be408aebbccbda46e8aa82ef337574137cfa0096 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java @@ -0,0 +1,335 @@ @@ -4396,7 +4396,7 @@ index 000000000..be408aebb +} diff --git a/src/main/java/com/tuinity/tuinity/util/misc/Delayed26WayDistancePropagator3D.java b/src/main/java/com/tuinity/tuinity/util/misc/Delayed26WayDistancePropagator3D.java new file mode 100644 -index 000000000..155d10994 +index 0000000000000000000000000000000000000000..155d10994f2d7df9ac927d955d99016fe304360f --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/misc/Delayed26WayDistancePropagator3D.java @@ -0,0 +1,295 @@ @@ -4697,7 +4697,7 @@ index 000000000..155d10994 +} diff --git a/src/main/java/com/tuinity/tuinity/util/misc/Delayed8WayDistancePropagator2D.java b/src/main/java/com/tuinity/tuinity/util/misc/Delayed8WayDistancePropagator2D.java new file mode 100644 -index 000000000..606417a8a +index 0000000000000000000000000000000000000000..606417a8aeaca2682595f417bba8e9d411999da9 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/misc/Delayed8WayDistancePropagator2D.java @@ -0,0 +1,713 @@ @@ -5416,7 +5416,7 @@ index 000000000..606417a8a +} diff --git a/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java b/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java new file mode 100644 -index 000000000..002abb3cb +index 0000000000000000000000000000000000000000..002abb3cbf0f742e685f2f043d2600de03e37a19 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java @@ -0,0 +1,165 @@ @@ -5586,7 +5586,7 @@ index 000000000..002abb3cb + } +} diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index ed9b2f9ad..9fbb77e70 100644 +index ed9b2f9adfecdc6d1b9925579ec510657adde11f..9fbb77e70d1abaf393fd6e4fd5cb124fcaedaef8 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -13,6 +13,149 @@ public class AxisAlignedBB { @@ -5764,7 +5764,7 @@ index ed9b2f9ad..9fbb77e70 100644 return d0 >= this.minX && d0 < this.maxX && d1 >= this.minY && d1 < this.maxY && d2 >= this.minZ && d2 < this.maxZ; } diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index 6b655b744..e811295b4 100644 +index 6b655b744d31d9660c7521ab596b27bcd92f4d58..e811295b4d6afcd920f60e0ce5440e43300d9085 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -16,9 +16,9 @@ public class BaseBlockPosition implements Comparable { @@ -5800,7 +5800,7 @@ index 6b655b744..e811295b4 100644 } diff --git a/src/main/java/net/minecraft/server/Behavior.java b/src/main/java/net/minecraft/server/Behavior.java -index 65af97652..0b9d469a9 100644 +index 65af976527133ee5c2f52e411e19c4f7f06df3ef..0b9d469a92decfb0632805791868ef7faa88c535 100644 --- a/src/main/java/net/minecraft/server/Behavior.java +++ b/src/main/java/net/minecraft/server/Behavior.java @@ -7,7 +7,7 @@ import java.util.Map.Entry; @@ -5813,7 +5813,7 @@ index 65af97652..0b9d469a9 100644 private final int d; private final int e; diff --git a/src/main/java/net/minecraft/server/BehaviorFindPosition.java b/src/main/java/net/minecraft/server/BehaviorFindPosition.java -index 63a761ebe..8d445e9c0 100644 +index 63a761ebef80d4af09cdc2682e496d78492c4a3a..8d445e9c0875db6cf45e4d8bcfce7cd3d5094d94 100644 --- a/src/main/java/net/minecraft/server/BehaviorFindPosition.java +++ b/src/main/java/net/minecraft/server/BehaviorFindPosition.java @@ -55,6 +55,227 @@ public class BehaviorFindPosition extends Behavior { @@ -6063,7 +6063,7 @@ index 63a761ebe..8d445e9c0 100644 worldserver.broadcastEntityEffect(entitycreature, obyte); }); diff --git a/src/main/java/net/minecraft/server/BehaviorGate.java b/src/main/java/net/minecraft/server/BehaviorGate.java -index 46e910581..fb967bc03 100644 +index 46e910581210421c8699637431804dc2f43eb4a6..fb967bc03f58fab8cec2732b1890108f2fc66af8 100644 --- a/src/main/java/net/minecraft/server/BehaviorGate.java +++ b/src/main/java/net/minecraft/server/BehaviorGate.java @@ -12,7 +12,7 @@ public class BehaviorGate extends Behavior { @@ -6178,7 +6178,7 @@ index 46e910581..fb967bc03 100644 }; diff --git a/src/main/java/net/minecraft/server/BehaviorLookInteract.java b/src/main/java/net/minecraft/server/BehaviorLookInteract.java -index a33303c31..ce57e6a4a 100644 +index a33303c31881b6391723e16a06d7841d48679958..ce57e6a4acac97d6da82202094306e7e91f1c87e 100644 --- a/src/main/java/net/minecraft/server/BehaviorLookInteract.java +++ b/src/main/java/net/minecraft/server/BehaviorLookInteract.java @@ -7,7 +7,7 @@ import java.util.function.Predicate; @@ -6250,7 +6250,7 @@ index a33303c31..ce57e6a4a 100644 return this.b.equals(entityliving.getEntityType()) && this.d.test(entityliving); } diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java -index 1f334d632..4d1ac4e6b 100644 +index 1f334d63282bd5c23dc3b275a220f09e60c34537..4d1ac4e6b61897fc03b091475ef7be3ed0b228a9 100644 --- a/src/main/java/net/minecraft/server/BlockBase.java +++ b/src/main/java/net/minecraft/server/BlockBase.java @@ -295,21 +295,23 @@ public abstract class BlockBase { @@ -6425,7 +6425,7 @@ index 1f334d632..4d1ac4e6b 100644 protected final boolean c; private final boolean[] j; diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index 12a023044..9e5e6de52 100644 +index 12a0230448dd8d56f6dc20e23cacaf0b8a9433d1..9e5e6de52efabe9126f6c47acb35fa1dc461ff4f 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -195,7 +195,7 @@ public class BlockChest extends BlockChestAbstract implements I @@ -6438,7 +6438,7 @@ index 12a023044..9e5e6de52 100644 if (tileentity instanceof IInventory) { InventoryUtils.dropInventory(world, blockposition, (IInventory) tileentity); diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 2d887af90..2291135ea 100644 +index 2d887af902a33b0e28d8f0a6ac2e59c815a7856e..2291135eaef64c403183724cb6e413cd7e472672 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -449,10 +449,10 @@ public class BlockPosition extends BaseBlockPosition { @@ -6535,7 +6535,7 @@ index 2d887af90..2291135ea 100644 @Override public BlockPosition immutableCopy() { diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index dcbae1c45..96bdb9580 100644 +index dcbae1c4512cf267719934785ea60de8ae66052d..96bdb95800f337f49d5194fb8d3b32b808a978ca 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -91,6 +91,175 @@ public class Chunk implements IChunkAccess { @@ -6797,7 +6797,7 @@ index dcbae1c45..96bdb9580 100644 int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D); diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java -index 8eecdcde5..187a63934 100644 +index 8eecdcde510661ec3a13a25a04ba394f6b6dc012..187a639347413a3aef1b6025926e2bf5936c11fd 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java +++ b/src/main/java/net/minecraft/server/ChunkCache.java @@ -1,5 +1,6 @@ @@ -7025,7 +7025,7 @@ index 8eecdcde5..187a63934 100644 this.e = world; this.a = blockposition.getX() >> 4; diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 3c7b225ed..f1c686810 100644 +index 3c7b225edbe23dc1959002293a6f8b816287b5a8..f1c686810fb4e9c05df45d664c93af73d17f0624 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -31,7 +31,7 @@ public abstract class ChunkMapDistance { @@ -7208,7 +7208,7 @@ index 3c7b225ed..f1c686810 100644 for (java.util.Iterator>>> iterator = this.tickets.long2ObjectEntrySet().fastIterator(); iterator.hasNext();) { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 6acb5f05a..84429f12d 100644 +index 6acb5f05a05c542f8257e205ef70987be2d29194..84429f12d0c6e0990b7cbb1b503b7868b3a02b14 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -22,6 +22,12 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; // Paper @@ -7625,7 +7625,7 @@ index 6acb5f05a..84429f12d 100644 try { boolean execChunkTask = com.destroystokyo.paper.io.chunk.ChunkTaskManager.pollChunkWaitQueue() || ChunkProviderServer.this.world.asyncChunkTaskManager.pollNextChunkTask(); // Paper diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 8e7da2c5f..64dd95292 100644 +index 8e7da2c5f3852920ec5fbcdd2bff4d299e6aa499..64dd95292fb4d058f6200bfcadaedfbd62b2461d 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -24,6 +24,14 @@ public class ChunkRegionLoader { @@ -7777,7 +7777,7 @@ index 8e7da2c5f..64dd95292 100644 BiomeStorage biomestorage = ichunkaccess.getBiomeIndex(); diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index e52df8096..ea943e44a 100644 +index e52df8096e399c84ff8a2637fdd65ea57d9001d0..ea943e44abb0ea9f7d471070fee14f6e5f205d53 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -11,10 +11,45 @@ public class ChunkSection { @@ -7866,7 +7866,7 @@ index e52df8096..ea943e44a 100644 if (!iblockdata.isAir()) { diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java -index f6c9bdbf5..51ea295d6 100644 +index f6c9bdbf52d773d7aa601125b887b347163f9328..51ea295d66312c95685b9fe4ee502a029d2fff20 100644 --- a/src/main/java/net/minecraft/server/ChunkStatus.java +++ b/src/main/java/net/minecraft/server/ChunkStatus.java @@ -109,7 +109,7 @@ public class ChunkStatus { @@ -7888,7 +7888,7 @@ index f6c9bdbf5..51ea295d6 100644 } diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index 26b48b5ff..353b61aa5 100644 +index 26b48b5ffa4ce3fbe50810dc1a8070d333a2684f..353b61aa57501fa76ce42dff5ba61bdb6a1e302e 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -52,6 +52,7 @@ public class DataBits { @@ -7916,7 +7916,7 @@ index 26b48b5ff..353b61aa5 100644 //Validate.inclusiveBetween(0L, (long) (this.e - 1), (long) i); // Paper int j = this.b(i); diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 95ef96286..73163b417 100644 +index 95ef96286855624590b72d69514b0fc0e08fddba..73163b417af7e522a4509bf9c1ab56d6499be622 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -163,6 +163,7 @@ public class DataPaletteBlock implements DataPaletteExpandable { @@ -7928,7 +7928,7 @@ index 95ef96286..73163b417 100644 T t0 = this.h.a(this.a.a(i)); diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 5504facd2..ecff0657e 100644 +index 5504facd2e453238caa71d98743be5416d4dd4fe..ecff0657e5666ddc2e6a5c3111bfb2b8dd2b78d3 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -169,6 +169,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -7949,7 +7949,7 @@ index 5504facd2..ecff0657e 100644 if (this.remoteControlListener != null) { diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index 550232cb3..229c3b0f0 100644 +index 550232cb3819138b3bae0fa1c51429485e8bc593..229c3b0f0c650b501f31147adaa17194af57fedd 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -70,7 +70,7 @@ public class EULA { @@ -7962,7 +7962,7 @@ index 550232cb3..229c3b0f0 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e44e5652c..d93db1049 100644 +index e44e5652c12fbee51acedc1f911181b8443fae93..d93db1049ef9421f6b3edd0dc52a421c4d1b51c2 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -8383,7 +8383,7 @@ index e44e5652c..d93db1049 100644 int j = MathHelper.floor(d1); int k = MathHelper.floor(d2); diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index 957a351c3..57166a543 100644 +index 957a351c3f6c4f66d7af6657ab0c3cbeed94662f..57166a543a9af9e10e38c983487fac7ea9d42d52 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -292,7 +292,7 @@ public class EntityCat extends EntityTameableAnimal { @@ -8396,7 +8396,7 @@ index 957a351c3..57166a543 100644 this.setPersistent(); } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index dcc5b098b..7b32a1fb7 100644 +index dcc5b098bfe36ef7ee8536b3da65c4ce1748c9d8..7b32a1fb79dcae355a8d95f3a8aa4284ec5d10db 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -709,7 +709,13 @@ public abstract class EntityInsentient extends EntityLiving { @@ -8415,7 +8415,7 @@ index dcc5b098b..7b32a1fb7 100644 if (entityhuman != null) { double d0 = entityhuman.h((Entity) this); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b88bd19fc..c57e7e1bc 100644 +index b88bd19fc3ebaf3ae467b5ad35a155505db77e6c..c57e7e1bccfc3a0cccfbaca44d9f369ec1f5683c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2846,7 +2846,11 @@ public abstract class EntityLiving extends Entity { @@ -8442,7 +8442,7 @@ index b88bd19fc..c57e7e1bc 100644 } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 976c44c8e..27c368bf1 100644 +index 976c44c8eeecc513fa11de55b80317550f621407..27c368bf19292e1076e1990a1d733eeac33ec0f4 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -525,6 +525,174 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -8621,7 +8621,7 @@ index 976c44c8e..27c368bf1 100644 this.playerConnection.sendPacket(new PacketPlayOutUpdateHealth(this.getBukkitEntity().getScaledHealth(), this.foodData.getFoodLevel(), this.foodData.getSaturationLevel())); // CraftBukkit this.lastHealthSent = this.getHealth(); diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 4efc40c01..f322dccd8 100644 +index 4efc40c01ec12b80bd7cf9d35cf0ea0df973baf7..f322dccd834ff56b99f8796309709b5b6ac01456 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -74,6 +74,7 @@ public class EntityTrackerEntry { @@ -8633,7 +8633,7 @@ index 4efc40c01..f322dccd8 100644 if (!list.equals(this.p)) { diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java -index 36aafc3b7..c9963c198 100644 +index 36aafc3b71013bcec0f4d956761fc2710848b3fd..c9963c19892c3e408964b72983bc6e26f8b63b67 100644 --- a/src/main/java/net/minecraft/server/EnumDirection.java +++ b/src/main/java/net/minecraft/server/EnumDirection.java @@ -160,8 +160,8 @@ public enum EnumDirection implements INamable { @@ -8648,7 +8648,7 @@ index 36aafc3b7..c9963c198 100644 } diff --git a/src/main/java/net/minecraft/server/HeightMap.java b/src/main/java/net/minecraft/server/HeightMap.java -index 068b92c5c..a43c4ca3e 100644 +index 068b92c5c4ae112771757626ea75694e59f3d255..a43c4ca3ea2e0dbf34a177592daed18c64bb14d3 100644 --- a/src/main/java/net/minecraft/server/HeightMap.java +++ b/src/main/java/net/minecraft/server/HeightMap.java @@ -19,7 +19,25 @@ public class HeightMap { @@ -8732,7 +8732,7 @@ index 068b92c5c..a43c4ca3e 100644 this.i = heightmap_use; this.j = predicate; diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java -index c4a83448e..5c3eb4fc7 100644 +index c4a83448ed4513f6e4ab179d1d43e5bb0cb13641..5c3eb4fc7e5aec2ad8d0050673fc8f4d2bff6a71 100644 --- a/src/main/java/net/minecraft/server/IBlockAccess.java +++ b/src/main/java/net/minecraft/server/IBlockAccess.java @@ -55,7 +55,7 @@ public interface IBlockAccess { @@ -8745,7 +8745,7 @@ index c4a83448e..5c3eb4fc7 100644 Vec3D vec3d1 = raytrace1.a(); VoxelShape voxelshape = raytrace1.a(iblockdata, this, blockposition); diff --git a/src/main/java/net/minecraft/server/IChunkAccess.java b/src/main/java/net/minecraft/server/IChunkAccess.java -index 180b6b58d..46f9ca664 100644 +index 180b6b58dc5663158db84b6f1257591439b48c31..46f9ca664782c4f68a34461dcf1cdc878b3517a8 100644 --- a/src/main/java/net/minecraft/server/IChunkAccess.java +++ b/src/main/java/net/minecraft/server/IChunkAccess.java @@ -24,6 +24,22 @@ public interface IChunkAccess extends IBlockAccess, IStructureAccess { @@ -8788,7 +8788,7 @@ index 180b6b58d..46f9ca664 100644 void b(boolean flag); diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java -index 582a5695b..5601088cd 100644 +index 582a5695bac7d078e3022b8ee70c512c0680d992..5601088cd5024a40e8296bab979f43de924c2b62 100644 --- a/src/main/java/net/minecraft/server/IChunkLoader.java +++ b/src/main/java/net/minecraft/server/IChunkLoader.java @@ -21,7 +21,7 @@ public class IChunkLoader implements AutoCloseable { @@ -8801,7 +8801,7 @@ index 582a5695b..5601088cd 100644 // Paper - nuke IOWorker } diff --git a/src/main/java/net/minecraft/server/ICollisionAccess.java b/src/main/java/net/minecraft/server/ICollisionAccess.java -index 25e54a1fa..cce0ac8a3 100644 +index 25e54a1fadc5d31fb250a3f47524b4f345fc8cc6..cce0ac8a36bef3b9e5a2b95e0c3dd137e8525226 100644 --- a/src/main/java/net/minecraft/server/ICollisionAccess.java +++ b/src/main/java/net/minecraft/server/ICollisionAccess.java @@ -28,6 +28,11 @@ public interface ICollisionAccess extends IBlockAccess { @@ -8829,7 +8829,7 @@ index 25e54a1fa..cce0ac8a3 100644 return this.d(entity, axisalignedbb, predicate).allMatch(VoxelShape::isEmpty); } finally { if (entity != null) entity.collisionLoadChunks = false; } // Paper diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index 2639c17b7..cbaf18af1 100644 +index 2639c17b7f6100533f33124f9e49990cd303d161..cbaf18af1066e8bde10293bba5eb3060bae1e66f 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -55,16 +55,26 @@ public interface IEntityAccess { @@ -8886,7 +8886,7 @@ index 2639c17b7..cbaf18af1 100644 } diff --git a/src/main/java/net/minecraft/server/ILightAccess.java b/src/main/java/net/minecraft/server/ILightAccess.java -index be5384ee4..df28f7a6b 100644 +index be5384ee41290b24b0c419c3e8f4553db34b2399..df28f7a6bf4c650a22ddf046eae4d5e8ca5879a9 100644 --- a/src/main/java/net/minecraft/server/ILightAccess.java +++ b/src/main/java/net/minecraft/server/ILightAccess.java @@ -4,9 +4,10 @@ import javax.annotation.Nullable; @@ -8903,7 +8903,7 @@ index be5384ee4..df28f7a6b 100644 IBlockAccess getWorld(); diff --git a/src/main/java/net/minecraft/server/LightEngineGraphSection.java b/src/main/java/net/minecraft/server/LightEngineGraphSection.java -index 13d067f48..04afd7f28 100644 +index 13d067f48647dea63ef1bf3a2a3e0868074ba75f..04afd7f285db2f281a038e0be6f557b8a692936b 100644 --- a/src/main/java/net/minecraft/server/LightEngineGraphSection.java +++ b/src/main/java/net/minecraft/server/LightEngineGraphSection.java @@ -74,8 +74,10 @@ public abstract class LightEngineGraphSection extends LightEngineGraph { @@ -8918,7 +8918,7 @@ index 13d067f48..04afd7f28 100644 this.a(Long.MAX_VALUE, i, j, flag); } diff --git a/src/main/java/net/minecraft/server/LightEngineStorage.java b/src/main/java/net/minecraft/server/LightEngineStorage.java -index b98e60772..e0bbfe142 100644 +index b98e60772bad7e06845b50fdc11e98c0ea775d3d..e0bbfe1422cbad811ecb43d7436380d86b0f8abc 100644 --- a/src/main/java/net/minecraft/server/LightEngineStorage.java +++ b/src/main/java/net/minecraft/server/LightEngineStorage.java @@ -23,7 +23,8 @@ public abstract class LightEngineStorage> e @@ -8950,7 +8950,7 @@ index b98e60772..e0bbfe142 100644 while (objectiterator.hasNext()) { entry = (Entry) objectiterator.next(); diff --git a/src/main/java/net/minecraft/server/LightEngineThreaded.java b/src/main/java/net/minecraft/server/LightEngineThreaded.java -index 2f9c97dd4..d4902ed0d 100644 +index 2f9c97dd4e1d705a87772d18c7ab4883a876af08..d4902ed0d12d9697402ca60bb8a298f753ccf527 100644 --- a/src/main/java/net/minecraft/server/LightEngineThreaded.java +++ b/src/main/java/net/minecraft/server/LightEngineThreaded.java @@ -2,6 +2,11 @@ package net.minecraft.server; @@ -9387,7 +9387,7 @@ index 2f9c97dd4..d4902ed0d 100644 public void a(int i) { diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index c61cd50df..d98748325 100644 +index c61cd50df0c81f7ab12bd0c955fd6f07f2b02e64..d987483255195c0bde713a92676baced1eaff2b3 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -234,7 +234,7 @@ public class LoginListener implements PacketLoginInListener { @@ -9400,7 +9400,7 @@ index c61cd50df..d98748325 100644 throw new IllegalStateException("Protocol error", cryptographyexception); } diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index ff74be145..e79e773f2 100644 +index ff74be14512a947e81b62d53e616131ca7d7f609..e79e773f2219f9a9ae076fcbc8108b792201b11a 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -38,6 +38,7 @@ import java.util.function.Consumer; @@ -9476,7 +9476,7 @@ index ff74be145..e79e773f2 100644 public static void mergeSortedSets(final java.util.function.Consumer consumer, final java.util.Comparator comparator, final java.util.SortedSet...sets) { final ObjectRBTreeSet all = new ObjectRBTreeSet<>(comparator); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 172fc9ef9..2bb471086 100644 +index 172fc9ef9c0d3444eb99f750a17d42f130d94f73..2bb4710868b4756c3446bb785c7dc1f00c9e4258 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -156,6 +156,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { @@ -10437,7 +10437,7 @@ index a22f0ccce..6cc4a035c 100644 this.d &= ~(1 << k); if (nibblearray != null) { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 5094a5d6f..72fdbf153 100644 +index 5094a5d6fb3c1a84d6e8f6abe79e894c047d9cfa..72fdbf1534b65284ac8020dcc15fe1512766d087 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -19,7 +19,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -10582,7 +10582,7 @@ index 5094a5d6f..72fdbf153 100644 } } diff --git a/src/main/java/net/minecraft/server/PathType.java b/src/main/java/net/minecraft/server/PathType.java -index fb37f5b50..52a2d3db7 100644 +index fb37f5b500c52f915b4536e5ec35552b75056046..52a2d3db7da3596bfdd6fd51147cc93bbe6c7ed0 100644 --- a/src/main/java/net/minecraft/server/PathType.java +++ b/src/main/java/net/minecraft/server/PathType.java @@ -4,6 +4,8 @@ public enum PathType { @@ -10595,7 +10595,7 @@ index fb37f5b50..52a2d3db7 100644 private PathType(float f) { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java b/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java -index 475c0764b..9f48d476c 100644 +index 475c0764b97b056f17720f37b1ca3eb1a2375334..9f48d476c05dbeabbfe3c650ce4ad33ec691a56a 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java @@ -50,7 +50,7 @@ public class PathfinderGoalMoveThroughVillage extends PathfinderGoal { @@ -10617,7 +10617,7 @@ index 475c0764b..9f48d476c 100644 if (!optional.isPresent()) { return false; diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index 74e81e1e4..33804e689 100644 +index 74e81e1e4aea6f74b14a84231ddeb7f2fb845ae7..33804e68931e8b4145b896eedeab79bde78779f2 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -421,6 +421,12 @@ public class PathfinderNormal extends PathfinderAbstract { @@ -10698,7 +10698,7 @@ index 74e81e1e4..33804e689 100644 Material material = iblockdata.getMaterial(); diff --git a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java -index 253377c62..3ebe3d0dc 100644 +index 253377c6238594de1f76cafcbf8223592e4d3f6b..3ebe3d0dc4c2c6aee6ea349006a74cbe5aa8e78f 100644 --- a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java +++ b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java @@ -51,6 +51,7 @@ public class PathfinderTargetCondition { @@ -10710,7 +10710,7 @@ index 253377c62..3ebe3d0dc 100644 if (entityliving == entityliving1) { return false; diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 11a67ca18..35a569f61 100644 +index 11a67ca18f566bfc214659e7fb454ea2b4d8a7ad..35a569f61ba2d48f3f9692927a23777bafcf26d6 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -56,6 +56,12 @@ public class PlayerChunk { @@ -10873,7 +10873,7 @@ index 11a67ca18..35a569f61 100644 if (chunk != null) { playerchunkmap.callbackExecutor.execute(() -> { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 6c399bcea..d3bf356ea 100644 +index 6c399bcea03e839bf2f21e92b5d76d46b7088667..d3bf356ea768a32a5684eb851a2a0addcc67727b 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -121,31 +121,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -11222,7 +11222,7 @@ index 6c399bcea..d3bf356ea 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 0aac84e98..1c8b477f8 100644 +index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -414,7 +414,9 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -11272,7 +11272,7 @@ index 0aac84e98..1c8b477f8 100644 } 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 7ea293f38..e698dd226 100644 +index 7ea293f38dedd6066601d94adbe175a31c502e1f..e698dd22607b2b2c4068c5bfb03ac53eb5bac080 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -13,10 +13,30 @@ public class PlayerConnectionUtils { @@ -11320,7 +11320,7 @@ index 7ea293f38..e698dd226 100644 }); throw CancelledPacketHandleException.INSTANCE; diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 485b609bb..614cfacb1 100644 +index 485b609bb5387b0f8a46c1201177cdc6d183ad91..614cfacb1e8ac5d68f0ce931933fac5d71ca39c9 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -21,14 +21,29 @@ public class PlayerInteractManager { @@ -11455,7 +11455,7 @@ index 485b609bb..614cfacb1 100644 this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196 } diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java -index 5b0cd414c..e2500821d 100644 +index 5b0cd414ca1949ab53b289f7159f18da07d21f14..e2500821dfa7060363e851dccc12e56dfc3cb051 100644 --- a/src/main/java/net/minecraft/server/ProtoChunk.java +++ b/src/main/java/net/minecraft/server/ProtoChunk.java @@ -48,6 +48,31 @@ public class ProtoChunk implements IChunkAccess { @@ -11530,7 +11530,7 @@ index 5b0cd414c..e2500821d 100644 } diff --git a/src/main/java/net/minecraft/server/ProtoChunkExtension.java b/src/main/java/net/minecraft/server/ProtoChunkExtension.java -index 300cbb8b0..60c57a2b5 100644 +index 300cbb8b01d94e7eb0cded0c8e118103c416d4b6..60c57a2b5008b1bf4af65df09fdc0f301b8143ff 100644 --- a/src/main/java/net/minecraft/server/ProtoChunkExtension.java +++ b/src/main/java/net/minecraft/server/ProtoChunkExtension.java @@ -8,7 +8,29 @@ import javax.annotation.Nullable; @@ -11565,7 +11565,7 @@ index 300cbb8b0..60c57a2b5 100644 public ProtoChunkExtension(Chunk chunk) { super(chunk.getPos(), ChunkConverter.a, chunk.world); // Paper - Anti-Xray - Add parameter diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 1751fb693..1ffa213a8 100644 +index 1751fb6934d9242e475c1a44b2a4a1ade6987766..1ffa213a819f9d39488ca3599f77e771de8081a5 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -5,6 +5,7 @@ import java.io.BufferedInputStream; @@ -12191,7 +12191,7 @@ index 1751fb693..1ffa213a8 100644 ((java.nio.Buffer) this.g).position(0); this.dataFile.write(this.g, 0L); diff --git a/src/main/java/net/minecraft/server/RegionFileBitSet.java b/src/main/java/net/minecraft/server/RegionFileBitSet.java -index 1ebdf73cc..cfa3ecb03 100644 +index 1ebdf73cc927405bc536dc74a5118d2a086db0e5..cfa3ecb031b59ec677f016ecdea92d16436fb511 100644 --- a/src/main/java/net/minecraft/server/RegionFileBitSet.java +++ b/src/main/java/net/minecraft/server/RegionFileBitSet.java @@ -4,18 +4,42 @@ import java.util.BitSet; @@ -12239,7 +12239,7 @@ index 1ebdf73cc..cfa3ecb03 100644 int j = 0; diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index d64f7ad92..8b341c14e 100644 +index d64f7ad925e5f40740a58ceee0845ac2db5419f2..8b341c14e7082fc96a464f2386a3dedea31ec59c 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -15,12 +15,43 @@ public class RegionFileCache implements AutoCloseable { // Paper - no final @@ -12331,7 +12331,7 @@ index d64f7ad92..8b341c14e 100644 } diff --git a/src/main/java/net/minecraft/server/RegionFileCompression.java b/src/main/java/net/minecraft/server/RegionFileCompression.java -index 3382d678e..3b7894256 100644 +index 3382d678e68e559b8d3cb9dced4fce24206cd38f..3b7894256dc8daa81be35f845cb5f8de02d7cb00 100644 --- a/src/main/java/net/minecraft/server/RegionFileCompression.java +++ b/src/main/java/net/minecraft/server/RegionFileCompression.java @@ -13,7 +13,7 @@ import javax.annotation.Nullable; @@ -12371,7 +12371,7 @@ index 3382d678e..3b7894256 100644 return (InputStream) this.f.wrap(inputstream); } diff --git a/src/main/java/net/minecraft/server/RegionFileSection.java b/src/main/java/net/minecraft/server/RegionFileSection.java -index 04256a951..79a11d17a 100644 +index 04256a95108b8182e8f808e856e0d2b62165e242..79a11d17a2822b192dec5981d0344ae689c3d385 100644 --- a/src/main/java/net/minecraft/server/RegionFileSection.java +++ b/src/main/java/net/minecraft/server/RegionFileSection.java @@ -25,8 +25,8 @@ public class RegionFileSection extends RegionFileCache implements AutoCloseab @@ -12447,7 +12447,7 @@ index 04256a951..79a11d17a 100644 if (!this.d.isEmpty()) { for (int i = 0; i < 16; ++i) { diff --git a/src/main/java/net/minecraft/server/SectionPosition.java b/src/main/java/net/minecraft/server/SectionPosition.java -index f95925f1c..0bb3ad0bf 100644 +index f95925f1c5d091f1a129d0437bb6e175c6ac080f..0bb3ad0bffc04eba38cd827eaf5c63e8bf2aee93 100644 --- a/src/main/java/net/minecraft/server/SectionPosition.java +++ b/src/main/java/net/minecraft/server/SectionPosition.java @@ -7,7 +7,7 @@ import java.util.stream.StreamSupport; @@ -12460,7 +12460,7 @@ index f95925f1c..0bb3ad0bf 100644 } diff --git a/src/main/java/net/minecraft/server/SensorNearestBed.java b/src/main/java/net/minecraft/server/SensorNearestBed.java -index ad3609f2b..d3d28f97f 100644 +index ad3609f2b884f64f1a1a449036cece49a46e933e..d3d28f97f9d2f969a182aec5e0947b6969d2939c 100644 --- a/src/main/java/net/minecraft/server/SensorNearestBed.java +++ b/src/main/java/net/minecraft/server/SensorNearestBed.java @@ -40,15 +40,15 @@ public class SensorNearestBed extends Sensor { @@ -12483,7 +12483,7 @@ index ad3609f2b..d3d28f97f 100644 } else if (this.b < 5) { this.a.long2LongEntrySet().removeIf((entry) -> { diff --git a/src/main/java/net/minecraft/server/SensorNearestItems.java b/src/main/java/net/minecraft/server/SensorNearestItems.java -index 2e747158d..1de170b9f 100644 +index 2e747158d48ab28ac1611990cc97aa4a9e30b30e..1de170b9fe6f2888da6dcf0151aaf1f865691c6a 100644 --- a/src/main/java/net/minecraft/server/SensorNearestItems.java +++ b/src/main/java/net/minecraft/server/SensorNearestItems.java @@ -18,20 +18,23 @@ public class SensorNearestItems extends Sensor { @@ -12523,7 +12523,7 @@ index 2e747158d..1de170b9f 100644 behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, optional); } diff --git a/src/main/java/net/minecraft/server/SensorNearestLivingEntities.java b/src/main/java/net/minecraft/server/SensorNearestLivingEntities.java -index f6568a54a..4005df5ef 100644 +index f6568a54ab85bc3a682f6fbb19dda7a783625bbe..4005df5ef3dec956a54feff539db2e63c226059a 100644 --- a/src/main/java/net/minecraft/server/SensorNearestLivingEntities.java +++ b/src/main/java/net/minecraft/server/SensorNearestLivingEntities.java @@ -21,10 +21,17 @@ public class SensorNearestLivingEntities extends Sensor { @@ -12549,7 +12549,7 @@ index f6568a54a..4005df5ef 100644 @Override diff --git a/src/main/java/net/minecraft/server/SensorNearestPlayers.java b/src/main/java/net/minecraft/server/SensorNearestPlayers.java -index 904a6d5ac..c8e43a9f2 100644 +index 904a6d5ac61d2ac81f1057068383e9ab432852db..c8e43a9f2a23178fdef52375b7204b90b28ac20b 100644 --- a/src/main/java/net/minecraft/server/SensorNearestPlayers.java +++ b/src/main/java/net/minecraft/server/SensorNearestPlayers.java @@ -19,22 +19,30 @@ public class SensorNearestPlayers extends Sensor { @@ -12599,7 +12599,7 @@ index 904a6d5ac..c8e43a9f2 100644 } } diff --git a/src/main/java/net/minecraft/server/SensorVillagerBabies.java b/src/main/java/net/minecraft/server/SensorVillagerBabies.java -index a367bbfde..794b33a13 100644 +index a367bbfde4fbfeca6d01dec49c05f5e185aab43a..794b33a13b7f11b973caf085b0bded9b2135a4d7 100644 --- a/src/main/java/net/minecraft/server/SensorVillagerBabies.java +++ b/src/main/java/net/minecraft/server/SensorVillagerBabies.java @@ -17,11 +17,23 @@ public class SensorVillagerBabies extends Sensor { @@ -12629,7 +12629,7 @@ index a367bbfde..794b33a13 100644 private boolean b(EntityLiving entityliving) { diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index 5f4dacf9c..0668d383d 100644 +index 5f4dacf9c93c2495a07df2647fe0411f796da6af..0668d383db1f3a81d1053954d72678c7ac5aecec 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -74,6 +74,11 @@ public class ServerConnection { @@ -12645,7 +12645,7 @@ index 5f4dacf9c..0668d383d 100644 protected void initChannel(Channel channel) throws Exception { try { diff --git a/src/main/java/net/minecraft/server/StructureManager.java b/src/main/java/net/minecraft/server/StructureManager.java -index f199368a6..2598ae371 100644 +index f199368a6d78b0cd52f11ca2c8509d729b918852..2598ae3710d46c2cfd2be5d6be2a56e59ceef6ea 100644 --- a/src/main/java/net/minecraft/server/StructureManager.java +++ b/src/main/java/net/minecraft/server/StructureManager.java @@ -35,8 +35,13 @@ public class StructureManager { @@ -12678,7 +12678,7 @@ index f199368a6..2598ae371 100644 if (!flag) { return structurestart; diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java -index e41cb8613..c19ffb925 100644 +index e41cb8613efc86499dfe3be36c9130ab6dc9b89e..c19ffb925a02d123da8a5c77186e6105422dccf7 100644 --- a/src/main/java/net/minecraft/server/Ticket.java +++ b/src/main/java/net/minecraft/server/Ticket.java @@ -5,17 +5,17 @@ import java.util.Objects; @@ -12715,7 +12715,7 @@ index e41cb8613..c19ffb925 100644 return j != 0L && i - this.d > j; } diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java -index 5c789b25f..3f942c632 100644 +index 5c789b25f1df2eae8ea8ceb4ba977ba336fe6d5e..3f942c632621e7ac7d3ac596aa408d687c3fa90d 100644 --- a/src/main/java/net/minecraft/server/TicketType.java +++ b/src/main/java/net/minecraft/server/TicketType.java @@ -26,8 +26,21 @@ public class TicketType { @@ -12742,7 +12742,7 @@ index 5c789b25f..3f942c632 100644 return new TicketType<>(s, comparator, 0L); } diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 2484293b1..1496c43fc 100644 +index 2484293b12d9ec88b8a2570aa853a12f0d858193..1496c43fc9487caf6ddb3782a9d1c79ef6ca1e94 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -49,6 +49,11 @@ public class UserCache { @@ -12827,7 +12827,7 @@ index 2484293b1..1496c43fc 100644 private static JsonElement a(UserCache.UserCacheEntry usercache_usercacheentry, DateFormat dateformat) { diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java -index 7f05587d4..5af554870 100644 +index 7f05587d42b7cdb09552277ec2e467f0edf06f10..5af554870bcf36e47aef43b966b141b9eda6c4d5 100644 --- a/src/main/java/net/minecraft/server/Vec3D.java +++ b/src/main/java/net/minecraft/server/Vec3D.java @@ -4,7 +4,7 @@ import java.util.EnumSet; @@ -12861,7 +12861,7 @@ index 7f05587d4..5af554870 100644 return this.x * this.x + this.y * this.y + this.z * this.z; } diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java -index b926cebd0..99778f80c 100644 +index b926cebd053bef829517c9d9bbf1c609c23ca04a..99778f80c0f6c2e15cc3b8298dc0bbc5493f3e83 100644 --- a/src/main/java/net/minecraft/server/VillagePlace.java +++ b/src/main/java/net/minecraft/server/VillagePlace.java @@ -4,6 +4,7 @@ import com.mojang.datafixers.DataFixer; @@ -13106,7 +13106,7 @@ index b926cebd0..99778f80c 100644 return this.d; } diff --git a/src/main/java/net/minecraft/server/VillagePlaceRecord.java b/src/main/java/net/minecraft/server/VillagePlaceRecord.java -index 0b40c2f4d..6eaf9fc9c 100644 +index 0b40c2f4dada7d8432e3f91e9cf206c2bda3b24b..6eaf9fc9cc93f79a497b07a3549d459ba66be849 100644 --- a/src/main/java/net/minecraft/server/VillagePlaceRecord.java +++ b/src/main/java/net/minecraft/server/VillagePlaceRecord.java @@ -6,7 +6,7 @@ import java.util.Objects; @@ -13119,7 +13119,7 @@ index 0b40c2f4d..6eaf9fc9c 100644 private int c; private final Runnable d; diff --git a/src/main/java/net/minecraft/server/VillagePlaceSection.java b/src/main/java/net/minecraft/server/VillagePlaceSection.java -index 77c66bc99..f43bc1f7d 100644 +index 77c66bc9952542d2444b402896a3d9f622ca2ff9..f43bc1f7d693d63c6bbdba976c048d2d0c8767b1 100644 --- a/src/main/java/net/minecraft/server/VillagePlaceSection.java +++ b/src/main/java/net/minecraft/server/VillagePlaceSection.java @@ -23,12 +23,12 @@ public class VillagePlaceSection { @@ -13138,7 +13138,7 @@ index 77c66bc99..f43bc1f7d 100644 return villageplacesection.e; }), VillagePlaceRecord.a(runnable).listOf().fieldOf("Records").forGetter((villageplacesection) -> { diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java -index eb926b74e..e3b72922e 100644 +index eb926b74e17fb2f88c1d6ce2fb546541f8e6e274..e3b72922e2dfad07f3452ec5ee2af379d968c52d 100644 --- a/src/main/java/net/minecraft/server/VoxelShape.java +++ b/src/main/java/net/minecraft/server/VoxelShape.java @@ -8,11 +8,11 @@ import javax.annotation.Nullable; @@ -13182,7 +13182,7 @@ index eb926b74e..e3b72922e 100644 List list = Lists.newArrayList(); diff --git a/src/main/java/net/minecraft/server/VoxelShapeArray.java b/src/main/java/net/minecraft/server/VoxelShapeArray.java -index 3c29cb145..c14b7bd63 100644 +index 3c29cb1452cde1308f630bfcb82876ef19057e8f..c14b7bd63e3917bc5f495655c40d8825a8d2062f 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeArray.java +++ b/src/main/java/net/minecraft/server/VoxelShapeArray.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -13303,7 +13303,7 @@ index 3c29cb145..c14b7bd63 100644 + // Tuinity end - optimise multi-aabb shapes } diff --git a/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java b/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java -index e841611bb..259605daa 100644 +index e841611bb7c36dffec44bb9e74a0a9657a113263..259605daabb18aedb15d56c78e6553ae2d22e13f 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java +++ b/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java @@ -91,7 +91,7 @@ public class VoxelShapeSpliterator extends AbstractSpliterator { @@ -13316,7 +13316,7 @@ index e841611bb..259605daa 100644 } diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java -index e21c747b6..636bbbc42 100644 +index e21c747b6c39155c44bf30860681d67b0b29fb12..636bbbc42466cb54c300352f400464fe64cc2e79 100644 --- a/src/main/java/net/minecraft/server/VoxelShapes.java +++ b/src/main/java/net/minecraft/server/VoxelShapes.java @@ -17,18 +17,101 @@ public final class VoxelShapes { @@ -13509,7 +13509,7 @@ index e21c747b6..636bbbc42 100644 @VisibleForTesting diff --git a/src/main/java/net/minecraft/server/WeightedList.java b/src/main/java/net/minecraft/server/WeightedList.java -index 5d9d58411..f0fdfd689 100644 +index 5d9d58411f2fad9d5da703f964d269b4a7c2b205..f0fdfd6891e59891e7370a2d682b65c647b28e9e 100644 --- a/src/main/java/net/minecraft/server/WeightedList.java +++ b/src/main/java/net/minecraft/server/WeightedList.java @@ -14,7 +14,7 @@ import java.util.stream.Stream; @@ -13531,7 +13531,7 @@ index 5d9d58411..f0fdfd689 100644 private double c; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9ed21f434..59abca0fd 100644 +index 9ed21f434c5fb019b74dfe9ee0b802ccc5c07fd8..59abca0fd2330e1cdeda603d4146e4bb1afc3090 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -94,6 +94,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -13795,7 +13795,7 @@ index 9ed21f434..59abca0fd 100644 public abstract Entity getEntity(int i); diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index f01186988..0d10d317c 100644 +index f011869880fedae4b69e505491e8bdbc5f51dfba..0d10d317cd0b60fc0866ae505c7fd71fa886c48b 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -47,11 +47,59 @@ public class WorldBorder { @@ -13882,7 +13882,7 @@ index f01186988..0d10d317c 100644 return this.j.d(); } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5b0b6edfa..800471d45 100644 +index 5b0b6edfa790918e56399ff6c83f3feb6e5aca49..800471d450ddcb8d291dc72e93c3d8251cc63248 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -55,12 +55,13 @@ import org.bukkit.event.server.MapInitializeEvent; @@ -14743,7 +14743,7 @@ index 5b0b6edfa..800471d45 100644 this.tickingEntities = wasTicking; // Paper } diff --git a/src/main/java/net/minecraft/server/WorldUpgrader.java b/src/main/java/net/minecraft/server/WorldUpgrader.java -index 5ccdc0b87..888dae2d5 100644 +index 5ccdc0b87b922724c3dd3085860c55d4959ca0b4..888dae2d5ee8a71e83dd24e5f3c6bc8513016f9d 100644 --- a/src/main/java/net/minecraft/server/WorldUpgrader.java +++ b/src/main/java/net/minecraft/server/WorldUpgrader.java @@ -218,7 +218,7 @@ public class WorldUpgrader { @@ -14756,7 +14756,7 @@ index 5ccdc0b87..888dae2d5 100644 try { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java -index 7511e3813..e602efcb3 100644 +index 7511e38130f38703164395a670f12d1af648ff04..e602efcb3fad390bb6bff1055e782bba909d7694 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java @@ -37,7 +37,7 @@ public class CraftCrashReport implements CrashReportCallable { @@ -14769,7 +14769,7 @@ index 7511e3813..e602efcb3 100644 } value.append("},"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0aa1da6cc..89a654b47 100644 +index 0aa1da6cc13c15d3e222986e60dc42edbe5477de..89a654b472dac986de7852b39c3ca72458d43c2d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper @@ -14825,7 +14825,7 @@ index 0aa1da6cc..89a654b47 100644 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b71316cce..a69b38f29 100644 +index b71316cce3bdbf3485be456f0260c6b3463cff8e..a69b38f293723a58691b2777d170f9cc146d1148 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -341,6 +341,14 @@ public class CraftWorld implements World { @@ -14908,7 +14908,7 @@ index b71316cce..a69b38f29 100644 }, MinecraftServer.getServer()); } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 010f702ea..d2ec9f7f1 100644 +index 010f702ea44d2146b0745b2b4d21f948d16cc424..d2ec9f7f105a36a1077ac0df56b1abb4786a565b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -138,6 +138,13 @@ public class Main { @@ -14935,7 +14935,7 @@ index 010f702ea..d2ec9f7f1 100644 //Thread.sleep(TimeUnit.SECONDS.toMillis(20)); // Paper End diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 4ec0e9220..1fe253bc7 100644 +index 4ec0e9220d2fa976dc6dfecd3eedb5b78a0ef8f4..1fe253bc7261a6077747addf8d9023ca94525999 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -503,27 +503,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -15006,7 +15006,7 @@ index 4ec0e9220..1fe253bc7 100644 public boolean teleport(org.bukkit.entity.Entity destination) { return teleport(destination.getLocation()); diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java -index fd32d1450..c38e514b0 100644 +index fd32d1450a6a2ede3405be7d31697cd16957f553..c38e514b004a4684026d5a89c606399a4fd7efe1 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java @@ -25,6 +25,10 @@ class CraftAsyncTask extends CraftTask { @@ -15029,7 +15029,7 @@ index fd32d1450..c38e514b0 100644 LinkedList getWorkers() { diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java -index 6fa2e271f..3a9491e94 100644 +index 6fa2e271f7f01cd0bf247e2071fa33bd8c5c6cbe..3a9491e9495bec93d5556bd8c09196ea117161d5 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -113,9 +113,18 @@ public final class CraftScoreboardManager implements ScoreboardManager { @@ -15052,7 +15052,7 @@ index 6fa2e271f..3a9491e94 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java -index f72c13bed..7c0d90552 100644 +index f72c13bedaa6fa45e26f5dcad564835bdd4af61f..7c0d90552eeb6de7dab174e2ba4acfc89a7b3db0 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java +++ b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java @@ -35,6 +35,13 @@ public class UnsafeList extends AbstractList implements List, RandomAcc @@ -15103,7 +15103,7 @@ index f72c13bed..7c0d90552 100644 public void clear() { // Create new array to reset memory usage to initial capacity diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 674096cab..001b1e519 100644 +index 674096cab190d62622f9947853b056f57d43a2a5..001b1e5197eaa51bfff9031aa6c69876c9a47960 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { @@ -15116,7 +15116,7 @@ index 674096cab..001b1e519 100644 if (stream != null) { diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java -index 9f7d2ef93..51e9c54cd 100644 +index 9f7d2ef932ab41cef5d3d0736d20a7c7e4a2c888..51e9c54cddf4b28ba3d3d892322c487774bdab70 100644 --- a/src/main/java/org/spigotmc/AsyncCatcher.java +++ b/src/main/java/org/spigotmc/AsyncCatcher.java @@ -10,8 +10,9 @@ public class AsyncCatcher @@ -15131,7 +15131,7 @@ index 9f7d2ef93..51e9c54cd 100644 } } diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 513c1041c..4d3109084 100644 +index 513c1041c34ebb3ac1775674a3f4526693759c08..4d310908489953d6d061b2358f614142edacb62e 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -61,6 +61,84 @@ public class WatchdogThread extends Thread diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch index 839e1c4e4..25fc93543 100644 --- a/patches/server/0002-Rebrand.patch +++ b/patches/server/0002-Rebrand.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 346108ed22b50b9ffb73379176b90f04336b3081 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand diff --git a/pom.xml b/pom.xml -index 78c2a8bbcc..0c982c3f0e 100644 +index 78c2a8bbcc0132f891c8aa545529d20aa0d9eb57..0c982c3f0eb9430fcec47477de1babe6f253f2aa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -85,7 +85,7 @@ index 78c2a8bbcc..0c982c3f0e 100644 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index 74ed02fa92..c1280478ee 100644 +index 74ed02fa9296583977bb721014b10ff8b708b43c..c1280478ee4565003883df9607d4a8a0e8fe4faa 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole { @@ -98,7 +98,7 @@ index 74ed02fa92..c1280478ee 100644 .completer(new ConsoleCommandCompleter(this.server)) ); diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index 229c3b0f0c..f88cf526d2 100644 +index 229c3b0f0c650b501f31147adaa17194af57fedd..f88cf526d272fe47b5a474c0b344b748ee4009fa 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -70,7 +70,7 @@ public class EULA { @@ -111,7 +111,7 @@ index 229c3b0f0c..f88cf526d2 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1ea1235a0a..7f834ba4cc 100644 +index 2bb4710868b4756c3446bb785c7dc1f00c9e4258..a8a90679687d680bb26b4fa7c1044f614585c867 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1512,7 +1512,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 9 May 2019 18:09:43 -0500 Subject: [PATCH] Purpur config files diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index ac7f390cf..3b9b44851 100644 +index ac7f390cf0a404daeb80f89326fe1e510292f817..3b9b44851c5832a3660a73449b52478c73ffb23a 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -585,7 +585,7 @@ public class Metrics { @@ -29,7 +29,7 @@ index ac7f390cf..3b9b44851 100644 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 6ab0a51b4..e21ef1bdc 100644 +index 6ab0a51b421dc696aec292f2db955311c9cc31e3..e21ef1bdc61b7ae98eb752130a4d125c78c652d9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -118,6 +118,11 @@ public class PaperConfig { @@ -45,7 +45,7 @@ index 6ab0a51b4..e21ef1bdc 100644 config.save(CONFIG_FILE); } catch (IOException ex) { diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index ecff0657e..3ee8d31c4 100644 +index ecff0657e5666ddc2e6a5c3111bfb2b8dd2b78d3..3ee8d31c453105eca7b96bede39a9ebbf40e1c2c 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -167,6 +167,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -65,7 +65,7 @@ index ecff0657e..3ee8d31c4 100644 // Paper end com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 9b35c8ad9..2c4c13b30 100644 +index 9b35c8ad9efe9241fe442bc6ef2e9f62def386d8..2c4c13b30b4533f5476f1128317d477ad8001bf5 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -166,7 +166,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -78,7 +78,7 @@ index 9b35c8ad9..2c4c13b30 100644 if (this.bF) { this.bF = false; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 59abca0fd..ca4d260e8 100644 +index 59abca0fd2330e1cdeda603d4146e4bb1afc3090..ca4d260e8faf852b0986c4cd8645e5135afe6156 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -95,6 +95,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -102,7 +102,7 @@ index 59abca0fd..ca4d260e8 100644 this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java new file mode 100644 -index 000000000..b807f8aa8 +index 0000000000000000000000000000000000000000..b807f8aa83325abfecc618cd9687d3e6e0ebf671 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -0,0 +1,130 @@ @@ -238,7 +238,7 @@ index 000000000..b807f8aa8 +} diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java new file mode 100644 -index 000000000..361f7857e +index 0000000000000000000000000000000000000000..361f7857e461578e90cb71e15027dadaf794cb69 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -0,0 +1,59 @@ @@ -303,7 +303,7 @@ index 000000000..361f7857e +} diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java new file mode 100644 -index 000000000..4904be939 +index 0000000000000000000000000000000000000000..4904be939c7a4b1d1583fd7b6232c930b79caba6 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java @@ -0,0 +1,65 @@ @@ -373,7 +373,7 @@ index 000000000..4904be939 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 991a79914..53ed0465a 100644 +index 991a79914805039ffe2572022b5f02628531f134..53ed0465a9f16dd82d77baec92683f287b4996ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -857,6 +857,7 @@ public final class CraftServer implements Server { @@ -420,7 +420,7 @@ index 991a79914..53ed0465a 100644 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d2ec9f7f1..b3c0ba202 100644 +index d2ec9f7f105a36a1077ac0df56b1abb4786a565b..b3c0ba202d26fd1f71a19839e2cb9fc9b56ab1ce 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -146,6 +146,14 @@ public class Main { diff --git a/patches/server/0004-Timings-stuff.patch b/patches/server/0004-Timings-stuff.patch index 1fee72106..d22cf979f 100644 --- a/patches/server/0004-Timings-stuff.patch +++ b/patches/server/0004-Timings-stuff.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 2a10fc4338cf0730e95ad3d791687d3dcc96bbf6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jun 2020 21:30:19 -0500 Subject: [PATCH] Timings stuff diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index 5dfa06588..dae2e5d70 100644 +index 5dfa0658838c4801cdf260eae8b98163f729e5af..dae2e5d70756c5b61163d57099b65f7e415b288c 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -227,10 +227,14 @@ public class TimingsExport extends Thread { diff --git a/patches/server/0005-Add-component-util.patch b/patches/server/0005-Add-component-util.patch index bdfc4dbfa..9c766c384 100644 --- a/patches/server/0005-Add-component-util.patch +++ b/patches/server/0005-Add-component-util.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 503d1eafc0e7e449e37110bb4731e7b9d75b8d73 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 15 Aug 2020 03:49:33 -0500 Subject: [PATCH] Add component util @@ -6,7 +6,7 @@ Subject: [PATCH] Add component util diff --git a/src/main/java/net/pl3x/purpur/ComponentUtil.java b/src/main/java/net/pl3x/purpur/ComponentUtil.java new file mode 100644 -index 000000000..3f7bc68d1 +index 0000000000000000000000000000000000000000..3f7bc68d1a6fb00758b178bb46113e38b8bc24bc --- /dev/null +++ b/src/main/java/net/pl3x/purpur/ComponentUtil.java @@ -0,0 +1,32 @@ diff --git a/patches/server/0006-Barrels-and-enderchests-6-rows.patch b/patches/server/0006-Barrels-and-enderchests-6-rows.patch index 8d2bf586e..4d04a7c08 100644 --- a/patches/server/0006-Barrels-and-enderchests-6-rows.patch +++ b/patches/server/0006-Barrels-and-enderchests-6-rows.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d812f82f6793f15cdd598b176d2d402f8a38a072 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 diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java -index 896d99d40..9ab8336df 100644 +index 896d99d404419fef5bdf6f9083e07dfc978f4e67..9ab8336df4f1702e9cabefb63f279034fdd57486 100644 --- a/src/main/java/net/minecraft/server/BlockEnderChest.java +++ b/src/main/java/net/minecraft/server/BlockEnderChest.java @@ -48,6 +48,27 @@ public class BlockEnderChest extends BlockChestAbstract im @@ -37,10 +37,10 @@ index 896d99d40..9ab8336df 100644 }, BlockEnderChest.e)); entityhuman.a(StatisticList.OPEN_ENDERCHEST); diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java -index bf8c5436b..5e56d5933 100644 +index fa56d6e3a9f0bfad3961697a3bae98205f32ae9c..3fc6298a5ef81c4203a79f1d9e87b0a9913255b6 100644 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java -@@ -20,11 +20,34 @@ public class InventoryEnderChest extends InventorySubcontainer { +@@ -19,11 +19,34 @@ public class InventoryEnderChest extends InventorySubcontainer { } public InventoryEnderChest(EntityHuman owner) { @@ -77,7 +77,7 @@ index bf8c5436b..5e56d5933 100644 this.a = tileentityenderchest; } diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java -index a1c3942cb..953741c1c 100644 +index a1c3942cbf9a6c0adc4943b05a1c3859c5f0aed6..953741c1cfd9b5c1e0eac80d1e4c7890f94e3bb1 100644 --- a/src/main/java/net/minecraft/server/TileEntityBarrel.java +++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java @@ -55,7 +55,7 @@ public class TileEntityBarrel extends TileEntityLootable { @@ -107,7 +107,7 @@ index a1c3942cb..953741c1c 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 1d00832bf..803a7ff92 100644 +index b807f8aa83325abfecc618cd9687d3e6e0ebf671..a25e505e0f778500a400362b23af62dc663ebff6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -7,6 +7,7 @@ import org.bukkit.Bukkit; @@ -148,7 +148,7 @@ index 1d00832bf..803a7ff92 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java -index 8c714c743..cae362bae 100644 +index 8c714c7430c0a6b8fd7f4a158d9a271e1642bd7a..cae362bae9e1e253c34bc81813d251fece839de3 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java @@ -198,8 +198,10 @@ public class CraftContainer extends Container { @@ -164,7 +164,7 @@ index 8c714c743..cae362bae 100644 case DISPENSER: case DROPPER: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java -index bba9bddc1..c2802c5bf 100644 +index bba9bddc1c0aacade9b7ad56afb1e630caa078fc..c2802c5bfb5ec82daad32d3a3375f4428ae76dfd 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -81,7 +81,7 @@ public class CraftInventory implements Inventory { diff --git a/patches/server/0007-Advancement-API.patch b/patches/server/0007-Advancement-API.patch index 0b42baf83..7230d6df5 100644 --- a/patches/server/0007-Advancement-API.patch +++ b/patches/server/0007-Advancement-API.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From aa9c5ad4ef73d877a09cf2a5c77c256076874fd4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 31 May 2019 21:24:33 -0500 Subject: [PATCH] Advancement API diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java -index c405047c0..384d4090f 100644 +index c405047c00d354bbc1449fd2f917b73f980ef1a5..384d4090f8ff1ea718de16affa5c146a2f58d28a 100644 --- a/src/main/java/net/minecraft/server/Advancement.java +++ b/src/main/java/net/minecraft/server/Advancement.java @@ -64,7 +64,7 @@ public class Advancement { @@ -18,7 +18,7 @@ index c405047c0..384d4090f 100644 } diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java -index b0d4b7a67..ac4fac898 100644 +index b0d4b7a67679a35fa8f88c241193c0f3814f1e7b..ac4fac89837f4e77dcaec6f9ca90c5aa8a78c4be 100644 --- a/src/main/java/net/minecraft/server/AdvancementDisplay.java +++ b/src/main/java/net/minecraft/server/AdvancementDisplay.java @@ -15,10 +15,11 @@ public class AdvancementDisplay { @@ -66,7 +66,7 @@ index b0d4b7a67..ac4fac898 100644 return this.h; } diff --git a/src/main/java/net/minecraft/server/AdvancementFrameType.java b/src/main/java/net/minecraft/server/AdvancementFrameType.java -index 90b78e49c..9a3a53cf3 100644 +index 90b78e49c0688dc2fb02df0b6784cd82fad4bc07..9a3a53cf3576c299629a84ba76cb5b9b86a14491 100644 --- a/src/main/java/net/minecraft/server/AdvancementFrameType.java +++ b/src/main/java/net/minecraft/server/AdvancementFrameType.java @@ -1,15 +1,26 @@ @@ -99,7 +99,7 @@ index 90b78e49c..9a3a53cf3 100644 this.e = i; this.f = enumchatformat; diff --git a/src/main/java/net/minecraft/server/CriterionTrigger.java b/src/main/java/net/minecraft/server/CriterionTrigger.java -index cfb420a9c..6fd3671c3 100644 +index cfb420a9c7e64ec240fff81d2e3fd32f607847b3..6fd3671c37a4fc42aa438a93d5a749b52f618b1e 100644 --- a/src/main/java/net/minecraft/server/CriterionTrigger.java +++ b/src/main/java/net/minecraft/server/CriterionTrigger.java @@ -26,6 +26,7 @@ public interface CriterionTrigger { @@ -111,7 +111,7 @@ index cfb420a9c..6fd3671c3 100644 return this.a; } diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java -index a5aadf285..b0a7092d6 100644 +index a5aadf2850f273e258f84b6c7bc9ca3649fb884d..b0a7092d623adccd61fd3e094f1ec5e8d95c3691 100644 --- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java @@ -27,4 +27,11 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement { @@ -128,7 +128,7 @@ index a5aadf285..b0a7092d6 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java new file mode 100644 -index 000000000..1cbb1e67b +index 0000000000000000000000000000000000000000..1cbb1e67b64a7e830cfabcd1fc07e998434476c3 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java @@ -0,0 +1,47 @@ diff --git a/patches/server/0008-Llama-API.patch b/patches/server/0008-Llama-API.patch index 5ef126192..c8710cfbd 100644 --- a/patches/server/0008-Llama-API.patch +++ b/patches/server/0008-Llama-API.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f387cdec6412d75917bd06dea124397f17245dd8 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 22:50:12 -0500 Subject: [PATCH] Llama API diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index d4175f2da..e90ff597d 100644 +index d9e1b43283bee15c659dd3a99e45d9412aedd0bc..e61f53816cbf09e775762403d97e9c591fb405a6 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -13,7 +13,8 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -73,7 +73,7 @@ index d4175f2da..e90ff597d 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java -index 1b29ca2ca..47ffa6696 100644 +index 1b29ca2ca0bc5d17673de43bdc854d5b4c96b8b6..47ffa669681da7512ee594ecb643f28576dee444 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java @@ -6,7 +6,7 @@ import java.util.List; @@ -102,7 +102,7 @@ index 1b29ca2ca..47ffa6696 100644 double d0 = this.a.h((Entity) this.a.fD()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java -index 3f94c5a92..a02763480 100644 +index 3f94c5a9206e2da9c852d282e267ab4d9f7324c4..a02763480149dc7fb0f07f17ef8530a2e76d99bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java @@ -65,4 +65,48 @@ public class CraftLlama extends CraftChestedHorse implements Llama, CraftRangedE diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0009-AFK-API.patch index f1edf882b..38288a97e 100644 --- a/patches/server/0009-AFK-API.patch +++ b/patches/server/0009-AFK-API.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 05dedac2f7d7e061f917a2b67e1f9f475ce2dd88 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 8 Aug 2019 15:29:15 -0500 Subject: [PATCH] AFK API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index caaa01b20e..335cb9c4a9 100644 +index caaa01b20e5b7430b809477022f8ab35f3c5bf20..335cb9c4a98ea9922ac5bdf9ee51a9f2baeac23c 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -84,6 +84,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -25,7 +25,7 @@ index caaa01b20e..335cb9c4a9 100644 super(EntityTypes.PLAYER, world); this.bL = ItemStack.b; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 27c368bf19..694159cca7 100644 +index 27c368bf19292e1076e1990a1d733eeac33ec0f4..694159cca7f98d2680133321f38d5dce859cc1b3 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1891,8 +1891,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -84,7 +84,7 @@ index 27c368bf19..694159cca7 100644 return this.serverStatisticManager; } diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index cbaf18af10..0c98a43602 100644 +index cbaf18af1066e8bde10293bba5eb3060bae1e66f..0c98a436021cbdedba5352073b1f8bf9852298eb 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -174,28 +174,18 @@ public interface IEntityAccess { @@ -129,7 +129,7 @@ index cbaf18af10..0c98a43602 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index b5e1a860a2..5f85a1d513 100644 +index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e3325b98ddd 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -7,6 +7,7 @@ import javax.annotation.Nullable; @@ -149,7 +149,7 @@ index b5e1a860a2..5f85a1d513 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 1c8b477f83..347675d6db 100644 +index 1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a..347675d6dbf3bffeda45babb584fb2a11778fa44 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -245,6 +245,12 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -193,7 +193,7 @@ index 1c8b477f83..347675d6db 100644 if (from.getX() != Double.MAX_VALUE) { Location oldTo = to.clone(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index bb310c7451..e082faf8cf 100644 +index 800471d450ddcb8d291dc72e93c3d8251cc63248..04578acc532849ef7c93a3515841aa05d9f7fee6 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -834,7 +834,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -215,7 +215,7 @@ index bb310c7451..e082faf8cf 100644 } else if (entityplayer.isSleeping()) { ++j; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 147e5bf0dc..6b896b7d46 100644 +index a25e505e0f778500a400362b23af62dc663ebff6..e3b263347a1e23046aadb1625fdb8a954131d3df 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,6 +1,7 @@ @@ -243,7 +243,7 @@ index 147e5bf0dc..6b896b7d46 100644 private static void timingsSettings() { timingsUrl = getString("settings.timings.url", timingsUrl); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 361f7857e4..2578a4677d 100644 +index 361f7857e461578e90cb71e15027dadaf794cb69..2578a4677d1ee060f687be531e696b7c7be89e84 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -56,4 +56,15 @@ public class PurpurWorldConfig { @@ -263,7 +263,7 @@ index 361f7857e4..2578a4677d 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 58caa3240b..6d97bcffb6 100644 +index 58caa3240b90cdc661e1e32e3f5c312ed62c3c21..6d97bcffb6a3a64de97f159dfbc3e21935bda3f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2216,4 +2216,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -289,7 +289,7 @@ index 58caa3240b..6d97bcffb6 100644 + // Purpur end } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 0b93635ba5..b47d6fa2de 100644 +index 0b93635ba59df4eb4456a97c5e9b51ab5aeda53f..b47d6fa2de3368d1afe329573bc18c3541bb7377 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -207,6 +207,7 @@ public class ActivationRange diff --git a/patches/server/0010-Bring-back-server-name.patch b/patches/server/0010-Bring-back-server-name.patch index 62d149c89..d8fd29e85 100644 --- a/patches/server/0010-Bring-back-server-name.patch +++ b/patches/server/0010-Bring-back-server-name.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 054c244083df4c0f37c102a2d0b81230768dbc3a 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 diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java -index 65961a0372..780474397a 100644 +index 65961a03728852bd75367083a0de6fd0082b17cb..780474397acb4d0e7ecb4540e1a2db5721e59d3d 100644 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java @@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager Date: Sat, 21 Mar 2020 11:47:39 -0500 Subject: [PATCH] Configurable server mod name diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7f834ba4cc..c7cd40ecb6 100644 +index a8a90679687d680bb26b4fa7c1044f614585c867..5e0f06a254d62acd491ba56371f3391423eb64fd 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1512,7 +1512,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 5 May 2019 12:58:45 -0500 Subject: [PATCH] LivingEntity safeFallDistance diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java -index 702242653a..9f4f56c47e 100644 +index 702242653a47051c9ed32304c427c27652af6157..9f4f56c47ecd4b35ebf33ca0bf9a040074ababf2 100644 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java @@ -4,6 +4,7 @@ public class EntityGiantZombie extends EntityMonster { @@ -17,7 +17,7 @@ index 702242653a..9f4f56c47e 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index fcb3114762..ce26e65aaf 100644 +index fcb31147622b4b81934be05ffc8de5e821ce69b7..ce26e65aaf25a41663ecd8c935967c33ff3de1dc 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -210,7 +210,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -30,7 +30,7 @@ index fcb3114762..ce26e65aaf 100644 protected int getChestSlots() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a0916a8836..561af0a097 100644 +index c57e7e1bccfc3a0cccfbaca44d9f369ec1f5683c..309a20e06461aeb362080b9aeb256f2c73d548a5 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -132,6 +132,7 @@ public abstract class EntityLiving extends Entity { @@ -62,7 +62,7 @@ index a0916a8836..561af0a097 100644 protected void playBlockStepSound() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 1fc356d0b7..6644723124 100644 +index 1fc356d0b74c1cbb19bf7527088f1f61b6da5422..66447231244dbe3d6fadaa0d00710f9ec7f72445 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -816,4 +816,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0013-Lagging-threshold.patch b/patches/server/0013-Lagging-threshold.patch index 788211ef8..1d9fe556a 100644 --- a/patches/server/0013-Lagging-threshold.patch +++ b/patches/server/0013-Lagging-threshold.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7dd143c1f4fe74fe0bc9eb53ef61a559befd1b9c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 10:07:16 -0500 Subject: [PATCH] Lagging threshold diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c7cd40ecb6..18002fe873 100644 +index 5e0f06a254d62acd491ba56371f3391423eb64fd..5d8cf545acf231f8f9c037db26f4d29bc01efabb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -168,6 +168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 5 Jul 2019 16:36:55 -0500 Subject: [PATCH] ItemFactory#getMonsterEgg diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java -index 76c585299..f543bd84f 100644 +index 76c585299096ab3719bf23b32f1ce046202a9818..f543bd84ffa3714eb0c4a6308f52470943afb452 100644 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java @@ -9,7 +9,7 @@ import javax.annotation.Nullable; @@ -18,7 +18,7 @@ index 76c585299..f543bd84f 100644 private final int c; private final EntityTypes d; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index af84813c7..2d38a4782 100644 +index af84813c703813ec3a6ca89ff437d89e31a9100f..2d38a4782d85dd9c5e6097bea6c13c6185ea05ab 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -388,4 +388,18 @@ public final class CraftItemFactory implements ItemFactory { diff --git a/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch index 206810197..8819062a1 100644 --- a/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch +++ b/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From c660b6587025feae44c5fa71181f24935b099a78 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jul 2019 18:21:00 -0500 Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index bf914dc5e..1138981ae 100644 +index bf914dc5ee7f2d4a324b6711ea273f5581ec84ad..1138981aebb7fbb3f3839dcd221e3ee850ab4456 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -143,6 +143,16 @@ public class EntityTypes { @@ -51,7 +51,7 @@ index bf914dc5e..1138981ae 100644 if (this.bp == null) { this.bp = new ChatMessage(this.f()); diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java -index f543bd84f..b5995f6fe 100644 +index f543bd84ffa3714eb0c4a6308f52470943afb452..b5995f6fe3f44c97780cc08d427c61f7890c4bd5 100644 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java @@ -7,6 +7,13 @@ import java.util.Objects; diff --git a/patches/server/0016-EMC-MonsterEggSpawnEvent.patch b/patches/server/0016-EMC-MonsterEggSpawnEvent.patch index df7159713..bf53551b0 100644 --- a/patches/server/0016-EMC-MonsterEggSpawnEvent.patch +++ b/patches/server/0016-EMC-MonsterEggSpawnEvent.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 9518434c526f5a55f7923738943636d81ec1cc0d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 20 Jul 2013 22:40:56 -0400 Subject: [PATCH] EMC - MonsterEggSpawnEvent diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 1138981ae..37b984a5b 100644 +index 1138981aebb7fbb3f3839dcd221e3ee850ab4456..37b984a5b6c1c6e146e1c4b0947d1e39a051cfbb 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -187,19 +187,46 @@ public class EntityTypes { diff --git a/patches/server/0017-EntityMoveEvent.patch b/patches/server/0017-EntityMoveEvent.patch index f800d0b6d..64a61550f 100644 --- a/patches/server/0017-EntityMoveEvent.patch +++ b/patches/server/0017-EntityMoveEvent.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a08bb7fd220cedcbb47ec2c7e93eaf1e6771cf16 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 11 Feb 2020 21:56:48 -0600 Subject: [PATCH] EntityMoveEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 561af0a097..21b5b7d2c4 100644 +index 309a20e06461aeb362080b9aeb256f2c73d548a5..4015804bb860f93c1a0fe4cd2596b479e6fa5a07 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2801,6 +2801,20 @@ public abstract class EntityLiving extends Entity { @@ -30,7 +30,7 @@ index 561af0a097..21b5b7d2c4 100644 this.damageEntity(DamageSource.DROWN, 1.0F); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 18002fe873..18721c9152 100644 +index 5d8cf545acf231f8f9c037db26f4d29bc01efabb..fe3b76e4ed11f0183731a0dcc39a323ccee3fd2e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1399,6 +1399,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index e082faf8cf..63b6a06737 100644 +index 04578acc532849ef7c93a3515841aa05d9f7fee6..b8e788eb66575051073ec2230e8b71dbd59d5b71 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -101,6 +101,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch index 75585be5a..56c50a149 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0018-Player-invulnerabilities.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 893dc719273a8177be2db8216e7db16e267cd6a7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 2 May 2020 20:55:44 -0500 Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 694159cca7..ddef5d06f4 100644 +index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a11ada49a4 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -148,6 +148,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -67,7 +67,7 @@ index 694159cca7..ddef5d06f4 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 347675d6db..b0f154080f 100644 +index 347675d6dbf3bffeda45babb584fb2a11778fa44..b0f154080fde4ad3ce03655d3e42953accb1edd6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1651,6 +1651,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -79,7 +79,7 @@ index 347675d6db..b0f154080f 100644 this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus)); // Paper end diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 70f702680f..0b453e9d12 100644 +index 70f702680f8221cb262023814a7bae21b0074da6..0b453e9d1299cb48df6d3d70048907f628896753 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -905,6 +905,8 @@ public abstract class PlayerList { @@ -92,7 +92,7 @@ index 70f702680f..0b453e9d12 100644 return entityplayer1; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2578a4677d..c441fcea9b 100644 +index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42050927dc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -67,4 +67,11 @@ public class PurpurWorldConfig { @@ -108,7 +108,7 @@ index 2578a4677d..c441fcea9b 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6d97bcffb6..e781ae267d 100644 +index 6d97bcffb6a3a64de97f159dfbc3e21935bda3f2..e781ae267d4c546261a1dcdfc24d9924eb5044fd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2232,5 +2232,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0019-Anvil-API.patch b/patches/server/0019-Anvil-API.patch index cf400baf1..abe3f57e0 100644 --- a/patches/server/0019-Anvil-API.patch +++ b/patches/server/0019-Anvil-API.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 97955e84887a4e51edac1bbcbe20d4c621b1bb7a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 19 Apr 2020 00:17:56 -0500 Subject: [PATCH] Anvil API diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java -index fc2038df89..4aa6b035a6 100644 +index fc2038df89f25c07f6f853f6df41fe9b203c3585..4aa6b035a6a8ea39401c6566cd286de39f60e942 100644 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java @@ -20,6 +20,8 @@ public class ContainerAnvil extends ContainerAnvilAbstract { @@ -92,7 +92,7 @@ index fc2038df89..4aa6b035a6 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java -index 9374c27061..d45f356be3 100644 +index 9374c27061280e51bcbae24573eb5d36736c3e4f..d45f356be39cbe271cd2a257b9dac66b88a346fd 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java @@ -9,7 +9,7 @@ import org.bukkit.inventory.AnvilInventory; diff --git a/patches/server/0020-Configurable-villager-brain-ticks.patch b/patches/server/0020-Configurable-villager-brain-ticks.patch index 843c9b418..7254d7570 100644 --- a/patches/server/0020-Configurable-villager-brain-ticks.patch +++ b/patches/server/0020-Configurable-villager-brain-ticks.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7841226eb8817b4020d45ed35ae12d2408d7b3e3 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 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 3c20a4e1c4..a02f54ab3a 100644 +index 2c4c13b30b4533f5476f1128317d477ad8001bf5..171e8553a339eb3c995369f274de86b824183ca6 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -58,6 +58,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -38,7 +38,7 @@ index 3c20a4e1c4..a02f54ab3a 100644 if (this.bF) { this.bF = false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c441fcea9b..c7fb5a737c 100644 +index c441fcea9b2b5a77b801c8a69541cf42050927dc..c7fb5a737cab0083c39732247acb8f4e87562894 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 { diff --git a/patches/server/0021-Alternative-Keepalive-Handling.patch b/patches/server/0021-Alternative-Keepalive-Handling.patch index 708dcc3d6..13c98009d 100644 --- a/patches/server/0021-Alternative-Keepalive-Handling.patch +++ b/patches/server/0021-Alternative-Keepalive-Handling.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From bfa570951859849a834f9739c19a9d7beae5be5e 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 diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java -index 8e93f1540b..470f92c4fb 100644 +index 8e93f1540ba5f995489c1fbcec70d10b011cd9c3..470f92c4fb0919d052b19acff8dff533724fbcc1 100644 --- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java +++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java @@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet { @@ -17,7 +17,7 @@ index 8e93f1540b..470f92c4fb 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 b0f154080f..4debbe924d 100644 +index b0f154080fde4ad3ce03655d3e42953accb1edd6..4debbe924dc530a363ecda070663ddd9e6c9562b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -81,6 +81,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -68,7 +68,7 @@ index b0f154080f..4debbe924d 100644 if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) { int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index bdf5a77eb3..1443034d21 100644 +index 0f39db0d35fae1d2c1b0dffc9aab715ab0ebadfd..0a14d60703073e6476020c43f8349996f381400a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -154,6 +154,11 @@ public class PurpurConfig { diff --git a/patches/server/0022-Silk-touch-spawners.patch b/patches/server/0022-Silk-touch-spawners.patch index 9b568c829..c223305ab 100644 --- a/patches/server/0022-Silk-touch-spawners.patch +++ b/patches/server/0022-Silk-touch-spawners.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a4cc16e82d6cd625765b41b2ca962eaf8a1931a4 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 diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java -index 81e145ff07..91b92d95a9 100644 +index 81e145ff0759322f74888c81df8d2133fece7144..91b92d95a961ba00ddd7026bb83d021bb1ac51ed 100644 --- a/src/main/java/net/minecraft/server/BlockMobSpawner.java +++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java @@ -1,5 +1,14 @@ @@ -93,7 +93,7 @@ index 81e145ff07..91b92d95a9 100644 return i; diff --git a/src/main/java/net/minecraft/server/ItemSpawner.java b/src/main/java/net/minecraft/server/ItemSpawner.java new file mode 100644 -index 0000000000..5c7f739185 +index 0000000000000000000000000000000000000000..5c7f73918542bbdbc8d8f97671f24091fc6cb83b --- /dev/null +++ b/src/main/java/net/minecraft/server/ItemSpawner.java @@ -0,0 +1,23 @@ @@ -121,7 +121,7 @@ index 0000000000..5c7f739185 + } +} diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java -index 1c861bccc2..67ebcbe4da 100644 +index 1c861bccc2652057cb154667a5bf7269092b2db4..67ebcbe4daa1ef3cef6ca43ec92befbe4156842e 100644 --- a/src/main/java/net/minecraft/server/Items.java +++ b/src/main/java/net/minecraft/server/Items.java @@ -180,7 +180,7 @@ public class Items { @@ -134,7 +134,7 @@ index 1c861bccc2..67ebcbe4da 100644 public static final Item cy = a(Blocks.CHEST, CreativeModeTab.c); public static final Item cz = a(Blocks.DIAMOND_ORE, CreativeModeTab.b); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c7fb5a737c..ba89efb315 100644 +index c7fb5a737cab0083c39732247acb8f4e87562894..ba89efb3159ab04a6239865967f93055cb6be7a9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1,6 +1,12 @@ diff --git a/patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch index e8d21faf5..62704c854 100644 --- a/patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch +++ b/patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From c424aedbac2f5cb9c2f7542dee3918eef2d84a4e 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 diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java -index 553c8affab..92cca6c44f 100644 +index 553c8affab6228cb187549deb5b34f79ba8f912c..92cca6c44f12a9283988b84681aac760f1c38d7e 100644 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java @@ -163,6 +163,23 @@ public class BlockTurtleEgg extends Block { @@ -34,7 +34,7 @@ index 553c8affab..92cca6c44f 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ba89efb315..f403f9dc6c 100644 +index ba89efb3159ab04a6239865967f93055cb6be7a9..f403f9dc6cd148b9f9c901f27ce6a77d4225a53f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -104,6 +104,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0024-MC-4-Fix-Item-position-desync.patch b/patches/server/0024-MC-4-Fix-Item-position-desync.patch index da4129df1..cc8af1d50 100644 --- a/patches/server/0024-MC-4-Fix-Item-position-desync.patch +++ b/patches/server/0024-MC-4-Fix-Item-position-desync.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 28a0cea5644ba73ca58be35596648a00481a73c7 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 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index f322dccd83..5cb6bb896e 100644 +index f322dccd834ff56b99f8796309709b5b6ac01456..5cb6bb896e8e71ee1b6b1ee3fff2fdb40cacfe76 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -134,6 +134,12 @@ public class EntityTrackerEntry { @@ -22,7 +22,7 @@ index f322dccd83..5cb6bb896e 100644 boolean flag2 = flag1 || this.tickCounter % 60 == 0; boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1; diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java -index e5da2b19c1..6d9d52e4fc 100644 +index e5da2b19c1177ba7f88f0aaad9d810bb313ce67b..6d9d52e4fc2cf55b21bfcb6cb1bcc6db9fb56773 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java @@ -14,10 +14,12 @@ public class PacketPlayOutEntity implements Packet { @@ -39,7 +39,7 @@ index e5da2b19c1..6d9d52e4fc 100644 return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 1443034d21..55416be665 100644 +index 0a14d60703073e6476020c43f8349996f381400a..ef90290d21ecebf6d7c2bfc2f2a63f65a3d429e9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -177,4 +177,9 @@ public class PurpurConfig { diff --git a/patches/server/0025-Fix-vanilla-command-permission-handler.patch b/patches/server/0025-Fix-vanilla-command-permission-handler.patch index b090af4dc..785227c58 100644 --- a/patches/server/0025-Fix-vanilla-command-permission-handler.patch +++ b/patches/server/0025-Fix-vanilla-command-permission-handler.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 9b0a9dfd14178a4646655a9936abdbaf26ce7f41 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 diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java -index d9c47f3fc1..cf35c9d545 100644 +index d9c47f3fc18266df3be1f564c01dfc3e26941380..cf35c9d545582173f81347a656faf1940892716f 100644 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java @@ -35,6 +35,7 @@ public abstract class CommandNode implements Comparable> { @@ -17,7 +17,7 @@ index d9c47f3fc1..cf35c9d545 100644 public void removeCommand(String name) { children.remove(name); diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java -index f344614600..8d89e671eb 100644 +index f34461460049a80c5ff57805927053a36a4db426..8d89e671eb9081f9198f2b2b2ae0b7bd186c1522 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java @@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand { diff --git a/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch index 8221946f1..9402bc001 100644 --- a/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7545956e42d5b7ceacb475d43dd20c9b41b78cbb 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) diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index c680319e40..eaa1063ff2 100644 +index c680319e4040be2b60795b22a5e65d6444cc67ed..eaa1063ff2bc5621e93043c4de41ca62f1323fde 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -170,6 +170,7 @@ public class AdvancementDataPlayer { @@ -17,7 +17,7 @@ index c680319e40..eaa1063ff2 100644 } // CraftBukkit end diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 55416be665..70a53c9283 100644 +index ef90290d21ecebf6d7c2bfc2f2a63f65a3d429e9..3d0aebd0bf1bd570f19ee296cca9f5eb8e693af1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -182,4 +182,11 @@ public class PurpurConfig { @@ -33,7 +33,7 @@ index 55416be665..70a53c9283 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java -index b14333ce9e..d25204f7d4 100644 +index b14333ce9e6921024bc93c2847b84f1fb40a5508..d25204f7d4af1ddd37005ccbcbe6c03d8eefcf47 100644 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java @@ -254,6 +254,7 @@ public final class CraftLegacy { diff --git a/patches/server/0027-Disable-outdated-build-check.patch b/patches/server/0027-Disable-outdated-build-check.patch index eb3609739..018a0cc78 100644 --- a/patches/server/0027-Disable-outdated-build-check.patch +++ b/patches/server/0027-Disable-outdated-build-check.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 37a769d9cd2b6d0b16b4c873820ed7e72d0b86b2 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 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index b3c0ba202d..a5394b04a6 100644 +index b3c0ba202d26fd1f71a19839e2cb9fc9b56ab1ce..a5394b04a6406323fe0f69c27b07fff4ffc14224 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -259,7 +259,7 @@ public class Main { diff --git a/patches/server/0028-Giants-AI-settings.patch b/patches/server/0028-Giants-AI-settings.patch index ad18554ac..606c93980 100644 --- a/patches/server/0028-Giants-AI-settings.patch +++ b/patches/server/0028-Giants-AI-settings.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 5ef78d6efbfd81c5dc078b55e9c9cf522a5f9a13 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 diff --git a/src/main/java/net/minecraft/server/AttributeMapBase.java b/src/main/java/net/minecraft/server/AttributeMapBase.java -index c57e23e16..92aa104dc 100644 +index c57e23e16b79017fe6dc084d634226cfdac772b5..92aa104dc51efa833eac289198bb9ee7dbacd66b 100644 --- a/src/main/java/net/minecraft/server/AttributeMapBase.java +++ b/src/main/java/net/minecraft/server/AttributeMapBase.java @@ -41,6 +41,7 @@ public class AttributeMapBase { @@ -17,7 +17,7 @@ index c57e23e16..92aa104dc 100644 public AttributeModifiable a(AttributeBase attributebase) { return (AttributeModifiable) this.b.computeIfAbsent(attributebase, (attributebase1) -> { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 8fdfec3b8..c90a767c7 100644 +index d93db1049ef9421f6b3edd0dc52a421c4d1b51c2..0502ba688d3d16f15fea1ddda1f7d0bcbe59d701 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -30,7 +30,7 @@ index 8fdfec3b8..c90a767c7 100644 public float I; protected final Random random; diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java -index 9f4f56c47..cf899bb6a 100644 +index 9f4f56c47ecd4b35ebf33ca0bf9a040074ababf2..cf899bb6a5bd9d913ea90facdd5f3cc0dda1e9d2 100644 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java @@ -4,9 +4,69 @@ public class EntityGiantZombie extends EntityMonster { @@ -113,7 +113,7 @@ index 9f4f56c47..cf899bb6a 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 7b32a1fb7..b281ca841 100644 +index 7b32a1fb79dcae355a8d95f3a8aa4284ec5d10db..b281ca841b2b7b51add3409318e2b92deb51eeda 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -948,6 +948,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -147,7 +147,7 @@ index 7b32a1fb7..b281ca841 100644 return false; } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 21b5b7d2c..bc88db73b 100644 +index 4015804bb860f93c1a0fe4cd2596b479e6fa5a07..bb4d4b10df0d6946a26e2b0b13f1c4a266f2e5e1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2159,7 +2159,7 @@ public abstract class EntityLiving extends Entity { @@ -160,7 +160,7 @@ index 21b5b7d2c..bc88db73b 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f403f9dc6..3207b8b61 100644 +index f403f9dc6cd148b9f9c901f27ce6a77d4225a53f..3207b8b6166bd28796cb9c199c3ab466f7c0a02e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -113,6 +113,28 @@ public class PurpurWorldConfig { diff --git a/patches/server/0029-Illusioners-AI-settings.patch b/patches/server/0029-Illusioners-AI-settings.patch index e21e6ef6d..c1bd028e8 100644 --- a/patches/server/0029-Illusioners-AI-settings.patch +++ b/patches/server/0029-Illusioners-AI-settings.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d34567f5b938d57a5afccca22ea5fad8a1fabe81 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 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java -index 50442b3a4..a9dcf6875 100644 +index 50442b3a498d1bab4270e69952a79f5182153ece..a9dcf6875efda502d174c74bd17026a5c8f0fdcb 100644 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java @@ -19,6 +19,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan @@ -28,7 +28,7 @@ index 50442b3a4..a9dcf6875 100644 protected void initPathfinder() { super.initPathfinder(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3207b8b61..5c716a6b4 100644 +index 3207b8b6166bd28796cb9c199c3ab466f7c0a02e..5c716a6b4f9ff33912ebb274b36eef70679ea87b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -135,6 +135,20 @@ public class PurpurWorldConfig { diff --git a/patches/server/0030-Zombie-horse-naturally-spawn.patch b/patches/server/0030-Zombie-horse-naturally-spawn.patch index eabf4b1c6..7f871d786 100644 --- a/patches/server/0030-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0030-Zombie-horse-naturally-spawn.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7d32d314aa0f91af7df576632021e195bd59ee3e 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 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 63b6a0673..c7a43dcce 100644 +index b8e788eb66575051073ec2230e8b71dbd59d5b71..9469d6052ad920f9fd9848e7ee55e488372e5e62 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1049,12 +1049,18 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -34,7 +34,7 @@ index 63b6a0673..c7a43dcce 100644 EntityLightning entitylightning = (EntityLightning) EntityTypes.LIGHTNING_BOLT.a((World) this); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5c716a6b4..04dfb8200 100644 +index 5c716a6b4f9ff33912ebb274b36eef70679ea87b..04dfb820053925c2835bdcec702d5a467a9fe48e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -155,4 +155,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0031-Charged-creeper-naturally-spawn.patch b/patches/server/0031-Charged-creeper-naturally-spawn.patch index ce7d1c637..f12dea81c 100644 --- a/patches/server/0031-Charged-creeper-naturally-spawn.patch +++ b/patches/server/0031-Charged-creeper-naturally-spawn.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From fd41c87d2ce48fb2e434f1c775be034670847d94 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 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 79ef955070..eb4a0ef0e7 100644 +index 79ef955070b2982be79cc58e40093624bd088ff0..eb4a0ef0e7a8bc8e0cb648bc369815ce0efb6223 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -23,6 +23,17 @@ public class EntityCreeper extends EntityMonster { @@ -27,7 +27,7 @@ index 79ef955070..eb4a0ef0e7 100644 protected void initPathfinder() { this.goalSelector.a(1, new PathfinderGoalFloat(this)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b652bfbdc3..a1c0dc687a 100644 +index 04dfb820053925c2835bdcec702d5a467a9fe48e..5b8961a061c4a877cfa856f6d9f6d77060060829 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -113,6 +113,11 @@ public class PurpurWorldConfig { @@ -41,4 +41,4 @@ index b652bfbdc3..a1c0dc687a 100644 + public float giantStepHeight = 2.0F; public float giantJumpHeight = 1.0F; - public double giantMaxHealth = 100.0D; + public double giantMovementSpeed = 0.5D; diff --git a/patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch index 1c1adc3b0..4d3d827ad 100644 --- a/patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch +++ b/patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 120dad34bc40102cb95f6b473206b5a2cc467fa7 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 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index 80a4a7175..25a9b7906 100644 +index 80a4a71753a1fd9f62e75f0b4ea9307ed7072c4f..25a9b7906be35e981566610c7d08aa8df5050d74 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -297,6 +297,10 @@ public class EntityRabbit extends EntityAnimal { @@ -37,7 +37,7 @@ index 80a4a7175..25a9b7906 100644 int i = this.random.nextInt(100); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5b8961a06..f51f60110 100644 +index 5b8961a061c4a877cfa856f6d9f6d77060060829..f51f60110dd6117979b9d9b230065ad21135824c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -154,6 +154,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch index df2906135..340ce41fb 100644 --- a/patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch +++ b/patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a2c498a3fdf32908a3c88ea8faa1fbb2dd48c585 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java -index 9beb6fad22..b98d094422 100644 +index 9beb6fad228ccb3081b661c845836f4f29404d86..b98d094422f09ddffe09bac7cf1a9c7e92ae5aa6 100644 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java @@ -133,6 +133,7 @@ public class PacketStatusListener implements PacketStatusInListener { diff --git a/patches/server/0034-Make-Iron-Golems-Swim.patch b/patches/server/0034-Make-Iron-Golems-Swim.patch index af90c2013..f0dacb54f 100644 --- a/patches/server/0034-Make-Iron-Golems-Swim.patch +++ b/patches/server/0034-Make-Iron-Golems-Swim.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 2ac911e2d7508ab45b42b9e6c92d4bcc6fce1b4c 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 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java -index 0a5c27e73..bdff23688 100644 +index 0a5c27e732540e03c87e6da0fbdc6e3c2e382810..bdff2368836dca230a6622a205d5772834afc6ee 100644 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java @@ -24,6 +24,7 @@ public class EntityIronGolem extends EntityGolem implements IEntityAngerable { @@ -17,7 +17,7 @@ index 0a5c27e73..bdff23688 100644 this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F)); this.goalSelector.a(2, new PathfinderGoalStrollVillage(this, 0.6D, false)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f51f60110..3ec33a963 100644 +index f51f60110dd6117979b9d9b230065ad21135824c..3ec33a96396e49d1ddb9f7eea804e4ae8080efbd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -154,6 +154,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0035-Dont-send-useless-entity-packets.patch b/patches/server/0035-Dont-send-useless-entity-packets.patch index 53d3fbccb..36b2f9b20 100644 --- a/patches/server/0035-Dont-send-useless-entity-packets.patch +++ b/patches/server/0035-Dont-send-useless-entity-packets.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7ca87c578326f2d6b11f3c409df784527b6b793b 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 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 5cb6bb896e..aea72b0db1 100644 +index 5cb6bb896e8e71ee1b6b1ee3fff2fdb40cacfe76..aea72b0db10eed151db18490c02f291c3cded92a 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -178,6 +178,7 @@ public class EntityTrackerEntry { @@ -40,7 +40,7 @@ index 5cb6bb896e..aea72b0db1 100644 this.tracker.c(entityplayer); entityplayer.c(this.tracker); diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java -index 6d9d52e4fc..0010448e3a 100644 +index 6d9d52e4fc2cf55b21bfcb6cb1bcc6db9fb56773..0010448e3aaafc53d0f8d60f36983cb381e7afc9 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java @@ -5,11 +5,11 @@ import java.io.IOException; @@ -61,7 +61,7 @@ index 6d9d52e4fc..0010448e3a 100644 protected boolean h; protected boolean i; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 70a53c9283..62cb13d1fa 100644 +index 3d0aebd0bf1bd570f19ee296cca9f5eb8e693af1..6a622c7166dcedc7454ed2183e946a14c712104d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -178,6 +178,11 @@ public class PurpurConfig { diff --git a/patches/server/0036-Tulips-change-fox-type.patch b/patches/server/0036-Tulips-change-fox-type.patch index 9337e35ea..09598db47 100644 --- a/patches/server/0036-Tulips-change-fox-type.patch +++ b/patches/server/0036-Tulips-change-fox-type.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 221fade86c7417b89393fd408220d9c2bec98056 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 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index 56c119e8d1..8845afd83d 100644 +index 56c119e8d11c5ffb1f90ac4249bce434b3e78884..8845afd83d47902d5192ec1a9146b6f20c5667d3 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -37,9 +37,9 @@ public class EntityFox extends EntityAnimal { @@ -70,7 +70,7 @@ index 56c119e8d1..8845afd83d 100644 protected org.bukkit.event.entity.EntityDeathEvent d(DamageSource damagesource) { // Paper ItemStack itemstack = this.getEquipment(EnumItemSlot.MAINHAND).cloneItemStack(); // Paper diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java -index 67ebcbe4da..4c379916d8 100644 +index 67ebcbe4daa1ef3cef6ca43ec92befbe4156842e..4c379916d8d7797038d2980761c49f44c010dea8 100644 --- a/src/main/java/net/minecraft/server/Items.java +++ b/src/main/java/net/minecraft/server/Items.java @@ -119,8 +119,8 @@ public class Items { @@ -85,7 +85,7 @@ index 67ebcbe4da..4c379916d8 100644 public static final Item bq = a(Blocks.OXEYE_DAISY, CreativeModeTab.c); public static final Item br = a(Blocks.CORNFLOWER, CreativeModeTab.c); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index fd552adb95..40bc4cc77b 100644 +index 3ec33a96396e49d1ddb9f7eea804e4ae8080efbd..459ff8ffe7c0bf09fe93d89b3433bc930bb52f06 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -118,6 +118,11 @@ public class PurpurWorldConfig { @@ -99,4 +99,4 @@ index fd552adb95..40bc4cc77b 100644 + public float giantStepHeight = 2.0F; public float giantJumpHeight = 1.0F; - public double giantMaxHealth = 100.0D; + public double giantMovementSpeed = 0.5D; diff --git a/patches/server/0037-Breedable-Polar-Bears.patch b/patches/server/0037-Breedable-Polar-Bears.patch index b48e15d75..a8732a777 100644 --- a/patches/server/0037-Breedable-Polar-Bears.patch +++ b/patches/server/0037-Breedable-Polar-Bears.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 27e456e59b1f56d6120b055974515d480dcd2201 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 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java -index 914c6e48d..99f0bd8f8 100644 +index 914c6e48d60ac8feadc08e52e050899fe1396a8d..99f0bd8f82520778d469ec51745034e6ebd3238a 100644 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java @@ -23,6 +23,30 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable { @@ -75,7 +75,7 @@ index 914c6e48d..99f0bd8f8 100644 this.datawatcher.set(EntityPolarBear.bo, flag); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 459ff8ffe..09b66b9ca 100644 +index 459ff8ffe7c0bf09fe93d89b3433bc930bb52f06..09b66b9ca3185528d0bc5f0a1d811c5a42039339 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -164,6 +164,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0038-Chickens-can-retaliate.patch b/patches/server/0038-Chickens-can-retaliate.patch index db69ecc07..bef8ee59b 100644 --- a/patches/server/0038-Chickens-can-retaliate.patch +++ b/patches/server/0038-Chickens-can-retaliate.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a131fde8b695a8ac6b1678fbe9d4c978d40e5048 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 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java -index 182469fd39..11a612fa39 100644 +index 182469fd39cb23633a3225cf1a64ab6b291e4cdf..11a612fa390cb0acf37fb84c5d5b6ea926dabad3 100644 --- a/src/main/java/net/minecraft/server/EntityChicken.java +++ b/src/main/java/net/minecraft/server/EntityChicken.java @@ -17,16 +17,35 @@ public class EntityChicken extends EntityAnimal { @@ -55,7 +55,7 @@ index 182469fd39..11a612fa39 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 882ac4c1f6..95e801ce26 100644 +index 09b66b9ca3185528d0bc5f0a1d811c5a42039339..c2a13de7f0cafc8c93c5255e0f65f5e8ad439c7a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -113,6 +113,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0039-Add-option-to-set-armorstand-step-height.patch b/patches/server/0039-Add-option-to-set-armorstand-step-height.patch index 9f0958719..7e221fa28 100644 --- a/patches/server/0039-Add-option-to-set-armorstand-step-height.patch +++ b/patches/server/0039-Add-option-to-set-armorstand-step-height.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From aab954e04efbe5abb2f59c2b0e707d1e02e43b74 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 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 8fef94ad9a..df3fc83029 100644 +index 8fef94ad9ac795311fb083a384ed98f1ea860f0a..df3fc83029ea9d06045a3f132f8e85b0c33b0649 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -618,6 +618,7 @@ public class EntityArmorStand extends EntityLiving { @@ -17,7 +17,7 @@ index 8fef94ad9a..df3fc83029 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 95e801ce26..f01c74a2ea 100644 +index c2a13de7f0cafc8c93c5255e0f65f5e8ad439c7a..0fa01267fa35f1afdc81c2636f9efa8506bcebb6 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 { diff --git a/patches/server/0040-Cat-spawning-options.patch b/patches/server/0040-Cat-spawning-options.patch index e60973455..9f56c38fc 100644 --- a/patches/server/0040-Cat-spawning-options.patch +++ b/patches/server/0040-Cat-spawning-options.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 36c8685064b05cce3c63111451906db3138af350 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 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index 0c98a43602..08778cc0de 100644 +index 0c98a436021cbdedba5352073b1f8bf9852298eb..08778cc0de9b1ffefc52d12d31403c33c50ddb2f 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -47,6 +47,7 @@ public interface IEntityAccess { @@ -17,7 +17,7 @@ index 0c98a43602..08778cc0de 100644 return this.a(oclass, axisalignedbb, IEntitySelector.g); } diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java -index 5e17868a76..6d0ebd8afe 100644 +index 5e17868a76ea8e3f105c11d496d6da12afa0da41..6d0ebd8afe690b3781917773419abe2856009769 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerCat.java +++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java @@ -16,7 +16,7 @@ public class MobSpawnerCat implements MobSpawner { @@ -62,7 +62,7 @@ index 5e17868a76..6d0ebd8afe 100644 } diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java -index 99778f80c0..be2ff3547c 100644 +index 99778f80c0f6c2e15cc3b8298dc0bbc5493f3e83..be2ff3547c76584f42ff532f67526595f4a66209 100644 --- a/src/main/java/net/minecraft/server/VillagePlace.java +++ b/src/main/java/net/minecraft/server/VillagePlace.java @@ -177,6 +177,7 @@ public class VillagePlace extends RegionFileSection { @@ -74,7 +74,7 @@ index 99778f80c0..be2ff3547c 100644 return this.c(predicate, blockposition, i, villageplace_occupancy).count(); } diff --git a/src/main/java/net/minecraft/server/VillagePlaceType.java b/src/main/java/net/minecraft/server/VillagePlaceType.java -index a5718af9b6..b6b4c8c491 100644 +index a5718af9b614ae505067131f04ebb490617d6aa4..b6b4c8c491d692f93d2c38d602ff99b0611b72aa 100644 --- a/src/main/java/net/minecraft/server/VillagePlaceType.java +++ b/src/main/java/net/minecraft/server/VillagePlaceType.java @@ -44,7 +44,7 @@ public class VillagePlaceType { @@ -95,7 +95,7 @@ index a5718af9b6..b6b4c8c491 100644 return this.E; } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index c7a43dccee..03dc6ab4b2 100644 +index 9469d6052ad920f9fd9848e7ee55e488372e5e62..e26fc1a6032027d16e72931c8329196b683774ba 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -2559,6 +2559,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -107,7 +107,7 @@ index c7a43dccee..03dc6ab4b2 100644 return this.getChunkProvider().j(); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f01c74a2ea..b32f4d74a0 100644 +index 0fa01267fa35f1afdc81c2636f9efa8506bcebb6..9c5de125a6ed207f238dff1e17e38a4083c4c251 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -118,6 +118,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0041-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0041-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch index 0d5ed436d..bfa0f3a61 100644 --- a/patches/server/0041-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch +++ b/patches/server/0041-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 93cd55490d5b42ed7f1cdd7b7df637948c0b5e37 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 diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java -index 6d0ebd8afe..c7a7870074 100644 +index 6d0ebd8afe690b3781917773419abe2856009769..c7a78700746384fb41e24e577022b3d3c9c4c9f6 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerCat.java +++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java @@ -80,8 +80,9 @@ public class MobSpawnerCat implements MobSpawner { diff --git a/patches/server/0042-Cows-eat-mushrooms.patch b/patches/server/0042-Cows-eat-mushrooms.patch index 9e1554e68..e119c5400 100644 --- a/patches/server/0042-Cows-eat-mushrooms.patch +++ b/patches/server/0042-Cows-eat-mushrooms.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 18938f36b6a913ff2cdfb7d7d3d38032b47b6cce 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 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index c90a767c78..cdd7b8d48f 100644 +index 0502ba688d3d16f15fea1ddda1f7d0bcbe59d701..bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2775,6 +2775,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index c90a767c78..cdd7b8d48f 100644 this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch); } diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 42e6761c8b..cfb009c811 100644 +index 42e6761c8b18b79ffd3f4d5e853ea87a2c153c23..cfb009c811bd2908d38da1b0007cb7aaed4e42c3 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -16,6 +16,7 @@ public class EntityCow extends EntityAnimal { @@ -110,7 +110,7 @@ index 42e6761c8b..cfb009c811 100644 public EntityCow createChild(WorldServer worldserver, EntityAgeable entityageable) { return (EntityCow) EntityTypes.COW.a((World) worldserver); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index bc88db73b7..8ed95fb471 100644 +index bb4d4b10df0d6946a26e2b0b13f1c4a266f2e5e1..3955e509542526ef5d9be0a4499303e2eef12f04 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity { @@ -123,7 +123,7 @@ index bc88db73b7..8ed95fb471 100644 public float aC; public float aD; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b32f4d74a0..d8bd7ffd5f 100644 +index 9c5de125a6ed207f238dff1e17e38a4083c4c251..0c841b824a93d5e43bad171d1ca828eca3e891df 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -132,6 +132,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0043-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0043-Fix-cow-rotation-when-shearing-mooshroom.patch index 3a0d78de9..b800306b2 100644 --- a/patches/server/0043-Fix-cow-rotation-when-shearing-mooshroom.patch +++ b/patches/server/0043-Fix-cow-rotation-when-shearing-mooshroom.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From c99110563e051ab8aaf61d665548fe41de0408e2 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 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index 1aacbae04c..38df17bd20 100644 +index 1aacbae04ce89be4da82d65116c494c493e71530..38df17bd206c908582ece2c4105235feaf0f2227 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -135,7 +135,13 @@ public class EntityMushroomCow extends EntityCow implements IShearable { diff --git a/patches/server/0044-Pigs-give-saddle-back.patch b/patches/server/0044-Pigs-give-saddle-back.patch index 412f1778c..890748d16 100644 --- a/patches/server/0044-Pigs-give-saddle-back.patch +++ b/patches/server/0044-Pigs-give-saddle-back.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 6a5d01ed3c658e58e7c9e9c45e7453466a697af7 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 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index ee94c2827..7f52c3923 100644 +index ee94c2827cfc53f7a37e61d8c1c0c30a52374cf8..7f52c39234e69b612b89993ce4503c20690064ed 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -109,6 +109,18 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable { @@ -28,7 +28,7 @@ index ee94c2827..7f52c3923 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0c841b824..24ef91788 100644 +index 0c841b824a93d5e43bad171d1ca828eca3e891df..24ef91788ff69004eed1b136a0ceb6176db00e76 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -188,6 +188,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0045-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0045-Snowman-drop-and-put-back-pumpkin.patch index 0a2272a79..8dbee1176 100644 --- a/patches/server/0045-Snowman-drop-and-put-back-pumpkin.patch +++ b/patches/server/0045-Snowman-drop-and-put-back-pumpkin.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 872401f754acaeb7cf455da90064bec3c68a2360 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 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index 48997367a..95ee716fc 100644 +index 48997367a67ffd1dbf29cdb048720610528f35cb..95ee716fc9b79b5fcb8508118b3876c51f3f6987 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java @@ -7,6 +7,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory; @@ -43,7 +43,7 @@ index 48997367a..95ee716fc 100644 return EnumInteractionResult.PASS; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 24ef91788..6d93ff4b0 100644 +index 24ef91788ff69004eed1b136a0ceb6176db00e76..6d93ff4b08582f0f3ea1bb4b582aaa881651d34d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -208,6 +208,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0046-Ender-dragon-always-drop-egg.patch b/patches/server/0046-Ender-dragon-always-drop-egg.patch index f24d21a9d..d3bd2f7f7 100644 --- a/patches/server/0046-Ender-dragon-always-drop-egg.patch +++ b/patches/server/0046-Ender-dragon-always-drop-egg.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 33f11f4cb88d5f0213ac17c4abbe1ab508983e6b 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 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java -index 38dc6086d1..f853f6c424 100644 +index 38dc6086d18951e065d4048d1d8eee288c5c5fd1..f853f6c424da77c40ee3d5b5dc2279ba8918977c 100644 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java @@ -358,7 +358,7 @@ public class EnderDragonBattle { @@ -18,7 +18,7 @@ index 38dc6086d1..f853f6c424 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c91f007044..064c158a14 100644 +index 6d93ff4b08582f0f3ea1bb4b582aaa881651d34d..bafead429f2ca19033a63241ff24b16f597f7678 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -142,6 +142,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0047-Ender-dragon-always-drop-full-exp.patch b/patches/server/0047-Ender-dragon-always-drop-full-exp.patch index 7479debba..2d4fde45c 100644 --- a/patches/server/0047-Ender-dragon-always-drop-full-exp.patch +++ b/patches/server/0047-Ender-dragon-always-drop-full-exp.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 4463c8ec54c80ee36f50b6a16406b8dff46b24de 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 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index de53af8c01..a5a2182455 100644 +index de53af8c01f8fa9636386737b6bc071b32f87cd1..a5a2182455542bb8fd62941bd0da2f38ba698f35 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -564,7 +564,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -18,7 +18,7 @@ index de53af8c01..a5a2182455 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 064c158a14..96b154bf23 100644 +index bafead429f2ca19033a63241ff24b16f597f7678..1623e65adf402269748cc06e8f2a42dcf411babb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -143,8 +143,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0048-Signs-editable-on-right-click.patch b/patches/server/0048-Signs-editable-on-right-click.patch index e2a04b362..cbac8a4a5 100644 --- a/patches/server/0048-Signs-editable-on-right-click.patch +++ b/patches/server/0048-Signs-editable-on-right-click.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 8e0ca42b88e7cb032d9dc616c97041f3ae0c6b88 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 diff --git a/src/main/java/net/minecraft/server/BlockSign.java b/src/main/java/net/minecraft/server/BlockSign.java -index 3585fd82c1..770ad5edfb 100644 +index 3585fd82c14338a82302ca403e91e6cfe65e1c19..770ad5edfb44acb69e7da33226ca6bf7c01a77b7 100644 --- a/src/main/java/net/minecraft/server/BlockSign.java +++ b/src/main/java/net/minecraft/server/BlockSign.java @@ -56,6 +56,17 @@ public abstract class BlockSign extends BlockTileEntity implements IBlockWaterlo @@ -27,7 +27,7 @@ index 3585fd82c1..770ad5edfb 100644 } else { return EnumInteractionResult.PASS; diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 2b9d5724c1..3167669702 100644 +index 2b9d5724c1b63f5e55010f9e3450004821c098a4..316766970243e8ac00e4c82f6c710de5edc3fa51 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -113,6 +113,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -39,7 +39,7 @@ index 2b9d5724c1..3167669702 100644 // Paper start //this.c = entityhuman; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 96b154bf23..f14e883133 100644 +index 1623e65adf402269748cc06e8f2a42dcf411babb..02587d8609b8aa8d2a48c38372f5c245878fe15e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -109,6 +109,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0049-Signs-allow-color-codes.patch b/patches/server/0049-Signs-allow-color-codes.patch index 1bf6eb8be..41d414bde 100644 --- a/patches/server/0049-Signs-allow-color-codes.patch +++ b/patches/server/0049-Signs-allow-color-codes.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 33e2cb3924b890297407f5cebbd2e13b5841016b 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 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index ddef5d06f4..a2924ab618 100644 +index ddef5d06f46ecb4178928b8ca751d9a11ada49a4..a2924ab6185183adccd78faf3eec02ee71e45795 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1416,6 +1416,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -17,10 +17,10 @@ index ddef5d06f4..a2924ab618 100644 this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition())); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 32bfd0e222..cf7540f235 100644 +index 4debbe924dc530a363ecda070663ddd9e6c9562b..7676659f44b84797aea0ffb4fc0ce6d934739e7b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2816,6 +2816,14 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2814,6 +2814,14 @@ public class PlayerConnection implements PacketListenerPlayIn { } } // Paper end @@ -36,7 +36,7 @@ index 32bfd0e222..cf7540f235 100644 } SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 3167669702..852bb5db84 100644 +index 316766970243e8ac00e4c82f6c710de5edc3fa51..852bb5db84ddd735f5e0d7f922918cc90b897e91 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -93,6 +93,18 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -59,7 +59,7 @@ index 3167669702..852bb5db84 100644 @Override public PacketPlayOutTileEntityData getUpdatePacket() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f14e883133..bc5cba3074 100644 +index 02587d8609b8aa8d2a48c38372f5c245878fe15e..77ab4cbbb08618fa72b264ebfb5f7211eec9af42 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -109,8 +109,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0050-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0050-Allow-soil-to-moisten-from-water-directly-under-it.patch index b882af6bf..9855830ad 100644 --- a/patches/server/0050-Allow-soil-to-moisten-from-water-directly-under-it.patch +++ b/patches/server/0050-Allow-soil-to-moisten-from-water-directly-under-it.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 6dff0e014dbfbf47b04401dbca20fa5485e553c0 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 diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java -index a315e2628c..8dd48669c2 100644 +index a315e2628c35ee713b68741c6e52c4b140c05f27..8dd48669c29dd51ed4d535dad0b0319f4bb2250c 100644 --- a/src/main/java/net/minecraft/server/BlockSoil.java +++ b/src/main/java/net/minecraft/server/BlockSoil.java @@ -116,19 +116,14 @@ public class BlockSoil extends Block { @@ -36,7 +36,7 @@ index a315e2628c..8dd48669c2 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index bc5cba3074..3721bd745e 100644 +index 77ab4cbbb08618fa72b264ebfb5f7211eec9af42..ce7b3775d81135a785599d1866a8fe88f897eff7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -109,6 +109,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0051-Controllable-Minecarts.patch b/patches/server/0051-Controllable-Minecarts.patch index 90da59a7c..bb3446a47 100644 --- a/patches/server/0051-Controllable-Minecarts.patch +++ b/patches/server/0051-Controllable-Minecarts.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 397fdf4419da494dee088093ebb2c632418fa478 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 29 Jun 2019 02:32:40 -0500 Subject: [PATCH] Controllable Minecarts diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 2291135eae..bc61aaff65 100644 +index 2291135eaef64c403183724cb6e413cd7e472672..bc61aaff65a7dc1e7534452b285953b83adb7000 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -36,6 +36,12 @@ public class BlockPosition extends BaseBlockPosition { @@ -22,7 +22,7 @@ index 2291135eae..bc61aaff65 100644 super(i, j, k); } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 8ed95fb471..1ef9fd4347 100644 +index 3955e509542526ef5d9be0a4499303e2eef12f04..73cf592ea678c469afd479dc5c803b1e0eac961c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -98,9 +98,9 @@ public abstract class EntityLiving extends Entity { @@ -39,7 +39,7 @@ index 8ed95fb471..1ef9fd4347 100644 protected double aV; protected double aW; diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index efe5c0ceca..a814cf280d 100644 +index efe5c0cecaf12ef921f6d32ff6670eff051bf323..a814cf280d1ce0d446d24da8e596f13e49678852 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -445,16 +445,62 @@ public abstract class EntityMinecartAbstract extends Entity { @@ -106,7 +106,7 @@ index efe5c0ceca..a814cf280d 100644 this.move(EnumMoveType.SELF, this.getMot()); if (!this.onGround) { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a2924ab618..a295968ed3 100644 +index a2924ab6185183adccd78faf3eec02ee71e45795..a295968ed35295d7247f7da37f8d9f56a7db6961 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -991,6 +991,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -118,7 +118,7 @@ index a2924ab618..a295968ed3 100644 if (!flag && isSpawnInvulnerable() && damagesource != DamageSource.OUT_OF_WORLD) { // Purpur diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java -index ceef7aaf92..002651aaf3 100644 +index ceef7aaf923026ff1044d6feba4297279eb44157..002651aaf3b8a9b489fe323756cd1ad13f9874e8 100644 --- a/src/main/java/net/minecraft/server/ItemMinecart.java +++ b/src/main/java/net/minecraft/server/ItemMinecart.java @@ -103,8 +103,10 @@ public class ItemMinecart extends Item { @@ -143,7 +143,7 @@ index ceef7aaf92..002651aaf3 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3721bd745e..4c3e13cf66 100644 +index ce7b3775d81135a785599d1866a8fe88f897eff7..7bb80ab8fde39f39a0834e4ed2d3002e73885737 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1,5 +1,7 @@ diff --git a/patches/server/0052-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0052-Disable-loot-drops-on-death-by-cramming.patch index c2c70f73b..9c88d0ef9 100644 --- a/patches/server/0052-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0052-Disable-loot-drops-on-death-by-cramming.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7000732981549c5abca8c43a9b57da291b1e0820 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 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 1ef9fd4347..29c4b454f0 100644 +index 73cf592ea678c469afd479dc5c803b1e0eac961c..a4d26d39a3d624dd11364b09aec1b408d4624ee5 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1484,8 +1484,10 @@ public abstract class EntityLiving extends Entity { @@ -20,7 +20,7 @@ index 1ef9fd4347..29c4b454f0 100644 // CraftBukkit start - Call death event org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4c3e13cf66..189b32a6f8 100644 +index 7bb80ab8fde39f39a0834e4ed2d3002e73885737..dde6877f175d6a80d86f78ce25aa4626cdd6bbe5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -112,6 +112,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0053-Players-should-not-cram-to-death.patch b/patches/server/0053-Players-should-not-cram-to-death.patch index abb2ddfc1..1c33e494a 100644 --- a/patches/server/0053-Players-should-not-cram-to-death.patch +++ b/patches/server/0053-Players-should-not-cram-to-death.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From e41dfbd783a569537045bc8fd701ef3777a9fc4b 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 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a295968ed3..36168d0f7c 100644 +index a295968ed35295d7247f7da37f8d9f56a7db6961..36168d0f7c730c636564808f4deb7cef42c35b64 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1393,7 +1393,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0054-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0054-Option-to-toggle-milk-curing-bad-omen.patch index 9a13b9cd4..17e79f691 100644 --- a/patches/server/0054-Option-to-toggle-milk-curing-bad-omen.patch +++ b/patches/server/0054-Option-to-toggle-milk-curing-bad-omen.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 0d4b2aaef862a744459b3bf2f0f214410f625430 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 diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java -index fcf254bbae..79554e18fc 100644 +index fcf254bbaeb3c0ffdb6834a8d5ad2c3cf4235e5b..79554e18fc39ecd9db87618a59d2e6709049820e 100644 --- a/src/main/java/net/minecraft/server/ItemMilkBucket.java +++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java @@ -20,7 +20,9 @@ public class ItemMilkBucket extends Item { @@ -19,7 +19,7 @@ index fcf254bbae..79554e18fc 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 189b32a6f8..11af56df60 100644 +index dde6877f175d6a80d86f78ce25aa4626cdd6bbe5..c60a3d7d9057e665023e464f62a3c2ea9ccd8b41 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -113,8 +113,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0055-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0055-End-gateway-should-check-if-entity-can-use-portal.patch index f93f813e9..f435f3593 100644 --- a/patches/server/0055-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0055-End-gateway-should-check-if-entity-can-use-portal.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 922005d3d36bbba205825d5aae9bec0b1e8022a3 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 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index e0118a971e..ed8e91bf6c 100644 +index e0118a971e1ea3c52a1380f519146b8f46a425ea..ed8e91bf6c8b9d410d439bdddd5067d346a20a7e 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -127,6 +127,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick diff --git a/patches/server/0056-Debug-stick-should-not-update-neighbors.patch b/patches/server/0056-Debug-stick-should-not-update-neighbors.patch index 63d92b6ef..33dfc7698 100644 --- a/patches/server/0056-Debug-stick-should-not-update-neighbors.patch +++ b/patches/server/0056-Debug-stick-should-not-update-neighbors.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 95be16c134c28de04a643ffec8f024db30da7ae0 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 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 3adb29f004..e7759f2481 100644 +index 3adb29f004d2fee36f3ee9b21ee5417e84b64837..e7759f24819ea7c62d3ae52ed1cc5c00f994a836 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -229,6 +229,11 @@ public final class ItemStack { diff --git a/patches/server/0057-Fix-the-dead-lagging-the-server.patch b/patches/server/0057-Fix-the-dead-lagging-the-server.patch index 29b31b18f..af61bf79e 100644 --- a/patches/server/0057-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0057-Fix-the-dead-lagging-the-server.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d3a067fee2b385aed135ead5a805e737bf50e9a2 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 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index cdd7b8d48f..35ed7f6742 100644 +index bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f..01cb91589912e1d3e4b1edf9cdc8fabfc767d0dc 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1521,6 +1521,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index cdd7b8d48f..35ed7f6742 100644 public void f(double d0, double d1, double d2) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 29c4b454f0..048690b788 100644 +index a4d26d39a3d624dd11364b09aec1b408d4624ee5..aafaafb4f28ea95fca8ff62a6d6cfaf0b2fb42d0 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2477,7 +2477,7 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0058-Skip-events-if-there-s-no-listeners.patch b/patches/server/0058-Skip-events-if-there-s-no-listeners.patch index 080d749a4..efb135efd 100644 --- a/patches/server/0058-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0058-Skip-events-if-there-s-no-listeners.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7935f37020d93290a099f1c4505c7f220edbdc85 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 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java -index 22d748008d..cabce1a8ba 100644 +index 22d748008d24fd6ed7cd8c4914e2ceb378f32c95..cabce1a8ba5db56495628edd9bc796aee7a53356 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -277,6 +277,7 @@ public class CommandDispatcher { diff --git a/patches/server/0059-Add-permission-for-F3-N-debug.patch b/patches/server/0059-Add-permission-for-F3-N-debug.patch index c1f31da4b..e8105a735 100644 --- a/patches/server/0059-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0059-Add-permission-for-F3-N-debug.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 2c8a5e2cfeaaa68253de6e340cb576d8e032d3ba 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 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 0b453e9d12..7b385eb43e 100644 +index 0b453e9d1299cb48df6d3d70048907f628896753..7b385eb43e4cf565d500d0250f3c5e4dbebae986 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1059,6 +1059,7 @@ public abstract class PlayerList { diff --git a/patches/server/0060-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0060-Add-wither-skeleton-takes-wither-damage-option.patch index 58c653e79..57fe99c83 100644 --- a/patches/server/0060-Add-wither-skeleton-takes-wither-damage-option.patch +++ b/patches/server/0060-Add-wither-skeleton-takes-wither-damage-option.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 4abb06c93275a05d04f8f94c29114813bd740fbd 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 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java -index 1ae9910fe..c872be77a 100644 +index 1ae9910fefece1a3fe6410b27642da6edd8f296d..c872be77a6cd767520d5412b38ec4ed4fa87ac2f 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java @@ -97,6 +97,6 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract { @@ -17,7 +17,7 @@ index 1ae9910fe..c872be77a 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c60a3d7d9..0db9da068 100644 +index c60a3d7d9057e665023e464f62a3c2ea9ccd8b41..0db9da068391a381b0a594dc15ae2182dc0f12d9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -281,6 +281,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0061-Configurable-TPS-Catchup.patch b/patches/server/0061-Configurable-TPS-Catchup.patch index 3a8112292..bf178f5e6 100644 --- a/patches/server/0061-Configurable-TPS-Catchup.patch +++ b/patches/server/0061-Configurable-TPS-Catchup.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 2201a5e2e2bf4fb20e836a3ba78b896a0cb4c0a6 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 18721c9152..0f9c6b964f 100644 +index fe3b76e4ed11f0183731a0dcc39a323ccee3fd2e..2d01bc9c5f95e7bd950a8c9137d1a1ab74a6cb72 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1003,7 +1003,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 19 Mar 2020 19:39:34 -0500 Subject: [PATCH] Add option to allow loyalty on tridents to work in the void diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java -index 8026a55d46..2acbe7437d 100644 +index 8026a55d462a646d6b39db21d52ba0871dfbc4d3..2acbe7437df71fc27580deddee8eb7655a297b70 100644 --- a/src/main/java/net/minecraft/server/EntityThrownTrident.java +++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java @@ -38,7 +38,7 @@ public class EntityThrownTrident extends EntityArrow { @@ -18,7 +18,7 @@ index 8026a55d46..2acbe7437d 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 79a87a1a16..72374b9e76 100644 +index 0db9da068391a381b0a594dc15ae2182dc0f12d9..fd111dae73f07a787edf38c2de41063c305d7a7d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -114,9 +114,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0063-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0063-Add-enderman-and-creeper-griefing-controls.patch index c07ddebbe..582c20e87 100644 --- a/patches/server/0063-Add-enderman-and-creeper-griefing-controls.patch +++ b/patches/server/0063-Add-enderman-and-creeper-griefing-controls.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 00b4113c6f1f679176385feb2f51a493c06d47b9 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 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index eb4a0ef0e7..2256b81624 100644 +index eb4a0ef0e7a8bc8e0cb648bc369815ce0efb6223..2256b81624b12b6f6cb54250b24fa12ad6da621d 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -215,7 +215,7 @@ public class EntityCreeper extends EntityMonster { @@ -18,7 +18,7 @@ index eb4a0ef0e7..2256b81624 100644 // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index f53525eb32..7b175240e4 100644 +index f53525eb32a6096ae24fd23756b2169d5d39e9d4..7b175240e44b0c7eb5044d7bcaf54dac22f50f2a 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -369,6 +369,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { @@ -47,7 +47,7 @@ index f53525eb32..7b175240e4 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 72374b9e76..94fc3230a3 100644 +index fd111dae73f07a787edf38c2de41063c305d7a7d..d0bb71e450026f830e5f52dce7ecf1d4c1011fb8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -191,8 +191,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0064-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0064-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch index b3d737cb1..f4fb7270c 100644 --- a/patches/server/0064-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch +++ b/patches/server/0064-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 902be05ae261ca1d29084018369808692919f935 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 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index b281ca841b..23d5d1f0a5 100644 +index b281ca841b2b7b51add3409318e2b92deb51eeda..23d5d1f0a5c7eb5ed04ccf1724354fe8162e75cf 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -544,7 +544,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -18,7 +18,7 @@ index b281ca841b..23d5d1f0a5 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 94fc3230a3..ef7ca798ab 100644 +index d0bb71e450026f830e5f52dce7ecf1d4c1011fb8..8677230d4bf721f7a24ffa56d6306a1adfb65e60 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -113,10 +113,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0065-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0065-Villagers-farming-can-bypass-mob-griefing-gamerule.patch index 65c95705a..f989e8e0e 100644 --- a/patches/server/0065-Villagers-farming-can-bypass-mob-griefing-gamerule.patch +++ b/patches/server/0065-Villagers-farming-can-bypass-mob-griefing-gamerule.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a29573f31689d32f9a929a0a2c70e218ce72b5f5 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 diff --git a/src/main/java/net/minecraft/server/BehaviorFarm.java b/src/main/java/net/minecraft/server/BehaviorFarm.java -index 54a555509..0ff202c0d 100644 +index 54a555509e3d83e9749609dc35897ad151bca681..0ff202c0d77681f7e0d55d57c69dd0e455336eba 100644 --- a/src/main/java/net/minecraft/server/BehaviorFarm.java +++ b/src/main/java/net/minecraft/server/BehaviorFarm.java @@ -18,7 +18,7 @@ public class BehaviorFarm extends Behavior { @@ -18,7 +18,7 @@ index 54a555509..0ff202c0d 100644 } else if (entityvillager.getVillagerData().getProfession() != VillagerProfession.FARMER) { return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8677230d4..79109fd94 100644 +index 8677230d4bf721f7a24ffa56d6306a1adfb65e60..79109fd94ba90ae43ce39d858b5d06a5f769a333 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -287,9 +287,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0066-Villagers-follow-emerald-blocks.patch b/patches/server/0066-Villagers-follow-emerald-blocks.patch index 9814dee20..a17512afe 100644 --- a/patches/server/0066-Villagers-follow-emerald-blocks.patch +++ b/patches/server/0066-Villagers-follow-emerald-blocks.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 6c715b3551df7e8bcd4671b8421c5cdfd7d9caed 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 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 171e8553a..0ab7d3441 100644 +index 171e8553a339eb3c995369f274de86b824183ca6..0ab7d3441bcafae9874134c7832a4b7c98bc5e64 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -74,6 +74,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -23,7 +23,7 @@ index 171e8553a..0ab7d3441 100644 public BehaviorController getBehaviorController() { return (BehaviorController) super.getBehaviorController(); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java -index 1fddf7c77..488a6891d 100644 +index 1fddf7c77488a5e53fc48d0db0a7b8acc71e2f42..488a6891d83b9673b5f9590e14283c44c0015316 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java @@ -14,6 +14,8 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent; @@ -36,7 +36,7 @@ index 1fddf7c77..488a6891d 100644 private CraftMerchant craftMerchant; diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java -index f1a509063..74c2d89af 100644 +index f1a509063c09e603140c74255a3fb901693d2cc5..74c2d89af516ffc252032d5cbd12b489ea46813e 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java @@ -40,6 +40,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract { @@ -48,7 +48,7 @@ index f1a509063..74c2d89af 100644 this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D)); this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 79109fd94..7b3df3fa4 100644 +index 79109fd94ba90ae43ce39d858b5d06a5f769a333..7b3df3fa454164bd13bbadd80d2900edeb4fc974 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -288,10 +288,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0067-Allow-leashing-villagers.patch b/patches/server/0067-Allow-leashing-villagers.patch index 8a969b628..fd0c7576f 100644 --- a/patches/server/0067-Allow-leashing-villagers.patch +++ b/patches/server/0067-Allow-leashing-villagers.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 5ca00a114149b2e5a622423a660ab25adc030de0 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 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 23d5d1f0a..23eb697f3 100644 +index 23d5d1f0a5c7eb5ed04ccf1724354fe8162e75cf..23eb697f3dc115405c42f625a00f7d802adfa962 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1147,6 +1147,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -17,7 +17,7 @@ index 23d5d1f0a..23eb697f3 100644 if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) { ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder())); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 0ab7d3441..3c457c896 100644 +index 0ab7d3441bcafae9874134c7832a4b7c98bc5e64..3c457c8962bd9e63ae81f3d4e0f172adb5b35b77 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -79,6 +79,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -33,7 +33,7 @@ index 0ab7d3441..3c457c896 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java -index 74c2d89af..96dda6a14 100644 +index 74c2d89af516ffc252032d5cbd12b489ea46813e..96dda6a14fd17509e9bcb72cc7e9c8532c6a036b 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java @@ -47,6 +47,13 @@ public class EntityVillagerTrader extends EntityVillagerAbstract { @@ -51,7 +51,7 @@ index 74c2d89af..96dda6a14 100644 @Override public EntityAgeable createChild(WorldServer worldserver, EntityAgeable entityageable) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7b3df3fa4..585e4aef1 100644 +index 7b3df3fa454164bd13bbadd80d2900edeb4fc974..585e4aef1a85924655165670aa408ca368eef864 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -287,17 +287,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0068-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0068-Implement-configurable-search-radius-for-villagers-t.patch index 54e0eb589..eb4d20c8b 100644 --- a/patches/server/0068-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0068-Implement-configurable-search-radius-for-villagers-t.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 9a638ffc6d2536bb9bb081f83931986b502b19eb 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 3c457c896..894089d66 100644 +index 3c457c8962bd9e63ae81f3d4e0f172adb5b35b77..894089d665e97da31c04c82aaae344b22f83de89 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -894,6 +894,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -18,7 +18,7 @@ index 3c457c896..894089d66 100644 for (int i = 0; i < 10; ++i) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 585e4aef1..db6fb004b 100644 +index 585e4aef1a85924655165670aa408ca368eef864..db6fb004be99341dba16c184244ed1a04c386fd4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -290,12 +290,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0069-Implement-infinite-lava.patch b/patches/server/0069-Implement-infinite-lava.patch index 6e6b20dd4..78b8ed2e4 100644 --- a/patches/server/0069-Implement-infinite-lava.patch +++ b/patches/server/0069-Implement-infinite-lava.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 48e2c5c96956f6c8e05c16b8c822cfb5720605b1 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 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java -index d72a88e927..35d55bc15b 100644 +index d72a88e9275eb00eed35b6467538a46e5cee32d5..35d55bc15b179a8200082ca23fad04bbe550068d 100644 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java @@ -195,7 +195,7 @@ public abstract class FluidTypeFlowing extends FluidType { @@ -36,7 +36,7 @@ index d72a88e927..35d55bc15b 100644 protected void a(GeneratorAccess generatoraccess, BlockPosition blockposition, IBlockData iblockdata, EnumDirection enumdirection, Fluid fluid) { diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java -index 29930e801c..ffab239192 100644 +index 29930e801cdcb97bec2fb113ec478fe9c4a63b63..ffab2391925f577420ee52f3aa05041afa61464e 100644 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java @@ -147,6 +147,18 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { @@ -59,7 +59,7 @@ index 29930e801c..ffab239192 100644 protected boolean f() { return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 13fc46d441..80e18c758d 100644 +index db6fb004be99341dba16c184244ed1a04c386fd4..d1f86ed2bbdec50e17b04814ea103bc0fb9ac0b1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -158,6 +158,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0070-Make-lava-flow-speed-configurable.patch b/patches/server/0070-Make-lava-flow-speed-configurable.patch index 224d7d20b..cc34dcfe4 100644 --- a/patches/server/0070-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0070-Make-lava-flow-speed-configurable.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From e4ccfcf7f84ed4c78105a968279ae4fdf52a10bd 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 diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java -index ffab239192..d981aa5a5f 100644 +index ffab2391925f577420ee52f3aa05041afa61464e..d981aa5a5f001333675eabd50497bbfa2dcf1df3 100644 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java @@ -129,7 +129,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { @@ -18,7 +18,7 @@ index ffab239192..d981aa5a5f 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 80e18c758d..7088bee595 100644 +index d1f86ed2bbdec50e17b04814ea103bc0fb9ac0b1..4fa008bdbd40effe092c7d36ac2157918fb6d3f6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -160,9 +160,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0071-Add-player-death-exp-control-options.patch b/patches/server/0071-Add-player-death-exp-control-options.patch index 7c2438706..a9e47e6e9 100644 --- a/patches/server/0071-Add-player-death-exp-control-options.patch +++ b/patches/server/0071-Add-player-death-exp-control-options.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 1a728549e2a0d6dda77d4a579f59ba3ee19cfd41 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 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 335cb9c4a9..75f9874115 100644 +index 335cb9c4a98ea9922ac5bdf9ee51a9f2baeac23c..75f98741153cf63cbb6b9abfabed0451277ba801 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -85,6 +85,8 @@ public abstract class EntityHuman extends EntityLiving { @@ -40,7 +40,7 @@ index 335cb9c4a9..75f9874115 100644 return 0; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7088bee595..adcd1779cf 100644 +index 4fa008bdbd40effe092c7d36ac2157918fb6d3f6..d54f699aba5c73704f2c739f8fb3f8becf8288ad 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -123,6 +123,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0072-PaperPR-Projectile-load-save-limit-per-chunk.patch b/patches/server/0072-PaperPR-Projectile-load-save-limit-per-chunk.patch index 47a526143..30488c831 100644 --- a/patches/server/0072-PaperPR-Projectile-load-save-limit-per-chunk.patch +++ b/patches/server/0072-PaperPR-Projectile-load-save-limit-per-chunk.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 41f9dc9bb456883704e43cac171bc45c1f2fa637 Mon Sep 17 00:00:00 2001 From: jmp Date: Wed, 18 Nov 2020 20:52:25 -0800 Subject: [PATCH] PaperPR - Projectile load/save limit per chunk @@ -9,7 +9,7 @@ that 5 arrows, 5 snowballs, 5 tridents, etc. will be allowed to be saved/loaded per chunk. The default value of -1 disables the limit. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ae5ed3bd0b..2452f54d96 100644 +index ae5ed3bd0b663092a4658b24cbd69d37b4e141cb..2452f54d96cab2d93140c64e25d9b799cbc94caa 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -709,4 +709,9 @@ public class PaperWorldConfig { @@ -23,7 +23,7 @@ index ae5ed3bd0b..2452f54d96 100644 + } } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 64dd95292f..3628b04fc4 100644 +index 64dd95292fb4d058f6200bfcadaedfbd62b2461d..3628b04fc4f4f4663b3780eadac6ff9e430e4900 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -525,11 +525,21 @@ public class ChunkRegionLoader { diff --git a/patches/server/0073-Add-canSaveToDisk-to-Entity.patch b/patches/server/0073-Add-canSaveToDisk-to-Entity.patch index f23f4fbce..0bb86190a 100644 --- a/patches/server/0073-Add-canSaveToDisk-to-Entity.patch +++ b/patches/server/0073-Add-canSaveToDisk-to-Entity.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 9793e47709fb61ea64a4ba926ecfc98dfcee6f31 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 18 Feb 2020 20:07:08 -0600 Subject: [PATCH] Add canSaveToDisk to Entity diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 3628b04fc4..b40cb0c7b2 100644 +index 3628b04fc4f4f4663b3780eadac6ff9e430e4900..b40cb0c7b25a9ef25dddcf01ab7b5e97fe68655d 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -532,6 +532,7 @@ public class ChunkRegionLoader { @@ -17,7 +17,7 @@ index 3628b04fc4..b40cb0c7b2 100644 final EntityTypes projectileType = entity.getEntityType(); if (savedProjectileCounts.getOrDefault(projectileType, 0) >= worldserver.paperConfig.projectileSaveLimit) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 35ed7f6742..d908e182b1 100644 +index 01cb91589912e1d3e4b1edf9cdc8fabfc767d0dc..ca7189dbf4f8e71163de55ee89cad15390744f96 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -308,6 +308,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/patches/server/0074-Configurable-void-damage-height.patch b/patches/server/0074-Configurable-void-damage-height.patch index e85cbe020..ab09cd1d6 100644 --- a/patches/server/0074-Configurable-void-damage-height.patch +++ b/patches/server/0074-Configurable-void-damage-height.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From da68f16b6af70dd7593405856e9d8317394eedec 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 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d908e182b1..0d95a7d09c 100644 +index ca7189dbf4f8e71163de55ee89cad15390744f96..ea1bccdc776c6eddbad1407cdc31a889875c8909 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -611,7 +611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index d908e182b1..0d95a7d09c 100644 && this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) { this.doVoidDamage(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index adcd1779cf..397f4ef158 100644 +index d54f699aba5c73704f2c739f8fb3f8becf8288ad..046c6e688c64c6f2b2d11c8d356ce0b738e7fc6e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -116,11 +116,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0075-Dispenser-curse-of-binding-protection.patch b/patches/server/0075-Dispenser-curse-of-binding-protection.patch index 33d8ac0f0..410b1bc17 100644 --- a/patches/server/0075-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0075-Dispenser-curse-of-binding-protection.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 1636014b730bab4974e1e91e2ebedf50a65338d2 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 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 23eb697f3d..7a40f08646 100644 +index 23eb697f3dc115405c42f625a00f7d802adfa962..7a40f0864677e54c3a0eca6dcb9a115864edfbbd 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -994,6 +994,13 @@ public abstract class EntityInsentient extends EntityLiving { @@ -23,7 +23,7 @@ index 23eb697f3d..7a40f08646 100644 Item item = itemstack.getItem(); diff --git a/src/main/java/net/minecraft/server/ItemArmor.java b/src/main/java/net/minecraft/server/ItemArmor.java -index 669a504118..7cd2e871b5 100644 +index 669a5041184846ca8430a7f0d3197025fe6d437e..7cd2e871b5a429a86dbc3c4208d247a4246ea1a8 100644 --- a/src/main/java/net/minecraft/server/ItemArmor.java +++ b/src/main/java/net/minecraft/server/ItemArmor.java @@ -35,7 +35,7 @@ public class ItemArmor extends Item implements ItemWearable { @@ -44,7 +44,7 @@ index 669a504118..7cd2e871b5 100644 return this.b; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 397f4ef158..45947e4a6c 100644 +index 046c6e688c64c6f2b2d11c8d356ce0b738e7fc6e..9b927dad1b054a21498205bf13f3952ea7ada48a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -162,6 +162,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0076-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0076-Add-option-for-boats-to-eject-players-on-land.patch index 798dba9ea..124e4120f 100644 --- a/patches/server/0076-Add-option-for-boats-to-eject-players-on-land.patch +++ b/patches/server/0076-Add-option-for-boats-to-eject-players-on-land.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 2308876a4b1fbd5010c4f6533dec99c22829bfe7 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 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java -index fdfdf83c28..d53bbe3169 100644 +index fdfdf83c28c3065fa89fba9e44b3da99f9791e0e..d53bbe31694c2d88939332691cdf145c46099e22 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java @@ -440,6 +440,7 @@ public class EntityBoat extends Entity { @@ -17,7 +17,7 @@ index fdfdf83c28..d53bbe3169 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 45947e4a6c..8039faa68f 100644 +index 9b927dad1b054a21498205bf13f3952ea7ada48a..97175fa5dc4d697118bb6391effef373bce110be 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -112,12 +112,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0077-Add-obfhelpers-for-plugin-use.patch b/patches/server/0077-Add-obfhelpers-for-plugin-use.patch index cdc84b1e4..1c1f8864d 100644 --- a/patches/server/0077-Add-obfhelpers-for-plugin-use.patch +++ b/patches/server/0077-Add-obfhelpers-for-plugin-use.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 0261d59430f2e37ca555e980919e05bbbbb18772 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 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index e7759f2481..2c908a6040 100644 +index e7759f24819ea7c62d3ae52ed1cc5c00f994a836..2c908a60401e851e56ec26e444d3c075cb256f24 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -644,6 +644,7 @@ public final class ItemStack { diff --git a/patches/server/0078-Mending-mends-most-damages-equipment-first.patch b/patches/server/0078-Mending-mends-most-damages-equipment-first.patch index a59ff49df..6eefa1dc9 100644 --- a/patches/server/0078-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0078-Mending-mends-most-damages-equipment-first.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 2547b6f8fed3e3654510008ca0336b94e2400b27 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 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java -index 7b26359430..33e2dc3a10 100644 +index 7b263594304a9b745f583fe7178ac16936cbd93b..33e2dc3a1003fe95fa71999fc24df84131238a6a 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java @@ -251,7 +251,30 @@ public class EnchantmentManager { @@ -41,7 +41,7 @@ index 7b26359430..33e2dc3a10 100644 return a(enchantment, entityliving, (itemstack) -> { return true; diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index c2be0c2bc3..358d6d6605 100644 +index c2be0c2bc315876f120cff207e5516dda2bd55d7..358d6d660581686a2e8d49e13e8c2ade9ec2fec2 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -220,7 +220,7 @@ public class EntityExperienceOrb extends Entity { @@ -54,7 +54,7 @@ index c2be0c2bc3..358d6d6605 100644 if (entry != null) { ItemStack itemstack = (ItemStack) entry.getValue(); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 2c908a6040..6a9b7e6094 100644 +index 2c908a60401e851e56ec26e444d3c075cb256f24..6a9b7e609489244c4d239895de77033f58632d9d 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -418,10 +418,19 @@ public final class ItemStack { @@ -78,7 +78,7 @@ index 2c908a6040..6a9b7e6094 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 8039faa68f..b4e42c2e65 100644 +index 97175fa5dc4d697118bb6391effef373bce110be..d61a96f0d9fc92780da0c698ffb4b903878a4198 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -112,6 +112,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0079-Implement-bamboo-growth-settings.patch b/patches/server/0079-Implement-bamboo-growth-settings.patch index bbe3e9159..83213af1e 100644 --- a/patches/server/0079-Implement-bamboo-growth-settings.patch +++ b/patches/server/0079-Implement-bamboo-growth-settings.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 25d7493da6036770489a095f7288b43b802bfed1 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 diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java -index f208ab5098..ce56edb7c8 100644 +index f208ab50985d71996c65fcf31615052b967acc93..ce56edb7c8543f3f685301ebf62d9836ccf4197c 100644 --- a/src/main/java/net/minecraft/server/BlockBamboo.java +++ b/src/main/java/net/minecraft/server/BlockBamboo.java @@ -99,7 +99,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement { @@ -63,7 +63,7 @@ index f208ab5098..ce56edb7c8 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b4e42c2e65..33eac638f4 100644 +index d61a96f0d9fc92780da0c698ffb4b903878a4198..b4358f89f9673170819c8995cd982952a3b915f3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -166,6 +166,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0080-Add-5-second-tps-average-in-tps.patch b/patches/server/0080-Add-5-second-tps-average-in-tps.patch index 2b49060de..80e160271 100644 --- a/patches/server/0080-Add-5-second-tps-average-in-tps.patch +++ b/patches/server/0080-Add-5-second-tps-average-in-tps.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 35246ee9d33cceeb3c49a4a39c713b51704036ab 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2d01bc9c5..dd1e08328 100644 +index 2d01bc9c5f95e7bd950a8c9137d1a1ab74a6cb72..dd1e083289b875f1b87ae2aa6179c7babaf79ad5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -167,7 +167,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 25 Jul 2019 18:07:37 -0500 Subject: [PATCH] Implement elytra settings diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 048690b788..27838680a2 100644 +index aafaafb4f28ea95fca8ff62a6d6cfaf0b2fb42d0..4ffad61ce7ec81e9e329c117c9d122c51dbb4f69 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2836,7 +2836,16 @@ public abstract class EntityLiving extends Entity { @@ -27,7 +27,7 @@ index 048690b788..27838680a2 100644 }); } diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java -index e775fe69ee..990eb65669 100644 +index e775fe69ee7e555721bc73e7cb0dd3136736bc9c..990eb656699d9ead26b42fbb305530b7ae860ee8 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -43,6 +43,14 @@ public class ItemFireworks extends Item { @@ -46,7 +46,7 @@ index e775fe69ee..990eb65669 100644 itemstack.subtract(1); } else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 6a9b7e6094..40f553e395 100644 +index 6a9b7e609489244c4d239895de77033f58632d9d..40f553e3950318f5a1940e3dccd0018653770fdb 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -450,7 +450,7 @@ public final class ItemStack { @@ -72,7 +72,7 @@ index 6a9b7e6094..40f553e395 100644 if (this.count == 1 && t0 instanceof EntityHuman) { org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) t0, this); diff --git a/src/main/java/net/minecraft/server/ItemTrident.java b/src/main/java/net/minecraft/server/ItemTrident.java -index 3663b70173..18f767dc57 100644 +index 3663b701736b583db80e3119b642e47b8a0e6ff3..18f767dc574e7345d2db73e6be44f4e65eb58c63 100644 --- a/src/main/java/net/minecraft/server/ItemTrident.java +++ b/src/main/java/net/minecraft/server/ItemTrident.java @@ -102,6 +102,16 @@ public class ItemTrident extends Item implements ItemVanishable { @@ -93,7 +93,7 @@ index 3663b70173..18f767dc57 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 33eac638f4..44dda36a5d 100644 +index b4358f89f9673170819c8995cd982952a3b915f3..db6607acc7540bbadfdf7684ac8f10baedd3ccf7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -129,6 +129,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0082-Item-entity-immunities.patch b/patches/server/0082-Item-entity-immunities.patch index 2edc78b5c..9d7f38608 100644 --- a/patches/server/0082-Item-entity-immunities.patch +++ b/patches/server/0082-Item-entity-immunities.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From b5bec3ddaf98c6f282d41315c56479acaaf8ae29 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 22 Feb 2020 15:54:08 -0600 Subject: [PATCH] Item entity immunities diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0d95a7d09c..5ec82345e1 100644 +index ea1bccdc776c6eddbad1407cdc31a889875c8909..c2692d6d667d6404a044f1ad1c24e612b6efcd30 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1470,6 +1470,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index 0d95a7d09c..5ec82345e1 100644 return this.O == tag; } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index ba73d14437..f55d40c981 100644 +index ba73d14437cfdf07ef0f1f6266131c113c2741fd..f55d40c981c75decfd7951669d541bae2fbce7b3 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -23,6 +23,8 @@ public class EntityItem extends Entity { @@ -68,7 +68,7 @@ index ba73d14437..f55d40c981 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index aea72b0db1..29731da08d 100644 +index aea72b0db10eed151db18490c02f291c3cded92a..29731da08d57f26b4173fef3f6fd37b36deb892e 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -106,6 +106,15 @@ public class EntityTrackerEntry { @@ -88,7 +88,7 @@ index aea72b0db1..29731da08d 100644 int i; int j; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 44dda36a5d..8773003e6f 100644 +index db6607acc7540bbadfdf7684ac8f10baedd3ccf7..66425f79a51587e21f83e11acb74f79a042c7850 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -101,6 +101,21 @@ public class PurpurWorldConfig { @@ -114,7 +114,7 @@ index 44dda36a5d..8773003e6f 100644 public boolean idleTimeoutTickNearbyEntities = true; public boolean idleTimeoutCountAsSleeping = false; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index bcbaad1185..96628c39e3 100644 +index bcbaad11852a51436a00c8e172bdd841ba93ec3c..96628c39e315d57b0153266cee48ee85ee3a0841 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -114,4 +114,26 @@ public class CraftItem extends CraftEntity implements Item { diff --git a/patches/server/0083-Add-ping-command.patch b/patches/server/0083-Add-ping-command.patch index 66fc7d898..eddf357a5 100644 --- a/patches/server/0083-Add-ping-command.patch +++ b/patches/server/0083-Add-ping-command.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 5e0efd40d816cc88dc0b4502473b636f8703e9cc 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 diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java -index 1194f91a51..9141976d1d 100644 +index 1194f91a51f87bc461af039fe0819aaf3e5c8bdd..9141976d1d6c5cef9eb4d415df2ad3b8f14ce913 100644 --- a/src/main/java/net/minecraft/server/ArgumentEntity.java +++ b/src/main/java/net/minecraft/server/ArgumentEntity.java @@ -69,10 +69,12 @@ public class ArgumentEntity implements ArgumentType { @@ -22,7 +22,7 @@ index 1194f91a51..9141976d1d 100644 List list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource()); diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java -index cabce1a8ba..1a13eb47e0 100644 +index cabce1a8ba5db56495628edd9bc796aee7a53356..1a13eb47e07776a53fab4ca38dcb48e55fb77b21 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -107,6 +107,7 @@ public class CommandDispatcher { @@ -55,7 +55,7 @@ index cabce1a8ba..1a13eb47e0 100644 return this.b; } diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java -index 86f1cfe454..da53af61d1 100644 +index 86f1cfe454ea0a989775b49a6b88375c766ef647..da53af61d1171db3c167c6e007adf95355771653 100644 --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java @@ -189,6 +189,7 @@ public class CommandListenerWrapper implements ICompletionProvider, com.destroys @@ -67,7 +67,7 @@ index 86f1cfe454..da53af61d1 100644 if (!(this.k instanceof EntityPlayer)) { throw CommandListenerWrapper.a.create(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 1c6265818b..68b3f1def3 100644 +index c71fc3e4bbe2b56ae50700bb2e41192690e59da8..f137d2a2800fb82420c95b17bb7a93ea9bbc414d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -133,10 +133,12 @@ public class PurpurConfig { @@ -85,7 +85,7 @@ index 1c6265818b..68b3f1def3 100644 public static String serverModName = "Purpur"; diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java new file mode 100644 -index 0000000000..3d4762c4a1 +index 0000000000000000000000000000000000000000..3d4762c4a179aaf4e270af018b940f93f1a7d9cd --- /dev/null +++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java @@ -0,0 +1,37 @@ diff --git a/patches/server/0084-Configurable-jockey-options.patch b/patches/server/0084-Configurable-jockey-options.patch index 8c32c0aa1..6ccfaca7b 100644 --- a/patches/server/0084-Configurable-jockey-options.patch +++ b/patches/server/0084-Configurable-jockey-options.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 955882fe674d45e63faa353e1f2e955d8e0cb82f 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 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 9ae0897bf..1a1028169 100644 +index 9ae0897bfd6a4577901d9189d0dba22f3ec2110c..1a102816921fa3b40f6d364bb826db4459f68eb2 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -21,6 +21,23 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -33,7 +33,7 @@ index 9ae0897bf..1a1028169 100644 protected void m() { this.goalSelector.a(1, new EntityDrowned.c(this, 1.0D)); diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java -index 65bae8c9f..32b75f710 100644 +index 65bae8c9f28c23b0b5dd5d048e7fc7daf328075c..32b75f710b12efbcecec2c8d72d4d8cb725870fe 100644 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java @@ -21,6 +21,23 @@ public class EntityPigZombie extends EntityZombie implements IEntityAngerable { @@ -61,7 +61,7 @@ index 65bae8c9f..32b75f710 100644 public void setAngerTarget(@Nullable UUID uuid) { this.br = uuid; diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index e3606722c..b90ea3144 100644 +index e3606722cb1b3f6a11d34e1cdef7210280dba677..b90ea31440fe49124bd2fb003884768ce8a1e528 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -137,7 +137,7 @@ index e3606722c..b90ea3144 100644 public GroupDataZombie(boolean flag, boolean flag1) { diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java -index 2d2830adc..ce6d79780 100644 +index 2d2830adc5229a8db7fc4b1170ea4c6f263e7182..ce6d79780197eb9300130036a8ed84648a17f9cf 100644 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java @@ -8,6 +8,23 @@ public class EntityZombieHusk extends EntityZombie { @@ -165,7 +165,7 @@ index 2d2830adc..ce6d79780 100644 return b(entitytypes, worldaccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || worldaccess.e(blockposition)); } diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index e021c43b4..505c83f3e 100644 +index e021c43b43839c00f81a01bfbec59c546d61ba50..505c83f3e3ad61c2d4d40c4df017e1f7a9a3ad8c 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -28,6 +28,23 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo @@ -193,7 +193,7 @@ index e021c43b4..505c83f3e 100644 protected void initDatawatcher() { super.initDatawatcher(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 66425f79a..14e05b7a7 100644 +index 66425f79a51587e21f83e11acb74f79a042c7850..14e05b7a7cc5e89f08d166399c0f2bd2259e09a9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -264,6 +264,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0085-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0085-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 381e3d712..b06805cc7 100644 --- a/patches/server/0085-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0085-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f017777537f45dfab7e5417798350fbfca30815a 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 diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java -index 6fe5678cf..bd0267ee4 100644 +index 6fe5678cffc2487fe00c953d772f764bb37a4b11..bd0267ee4b3782f6d1ec39cba7966ba4f62f1adf 100644 --- a/src/main/java/net/minecraft/server/DamageSource.java +++ b/src/main/java/net/minecraft/server/DamageSource.java @@ -88,6 +88,7 @@ public class DamageSource { @@ -17,7 +17,7 @@ index 6fe5678cf..bd0267ee4 100644 return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic(); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5ec82345e..974e75945 100644 +index c2692d6d667d6404a044f1ad1c24e612b6efcd30..477e95ebecea183a2ad3d1daac3b4010b7263c99 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2135,8 +2135,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -32,7 +32,7 @@ index 5ec82345e..974e75945 100644 } diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java -index 362ca695d..1942fae27 100644 +index 362ca695d88a7c788421cc557b8110b954d8153a..1942fae27051af79b6eb1d790a219da100bf889e 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java @@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity { @@ -100,7 +100,7 @@ index 362ca695d..1942fae27 100644 @Override protected void saveData(NBTTagCompound nbttagcompound) { diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 3a70900c7..dfce36368 100644 +index 3a70900c73e3a6c4f40cf74406534f4bfd3eb67b..dfce36368da9bdd9285c490a802f7a0cc4a339f6 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -9,9 +9,10 @@ import javax.annotation.Nullable; @@ -321,7 +321,7 @@ index 3a70900c7..dfce36368 100644 return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 14e05b7a7..dbeea1ece 100644 +index 14e05b7a7cc5e89f08d166399c0f2bd2259e09a9..dbeea1ecec72c84ba9648ea8c373d3e66dd220d6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -340,6 +340,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0086-Add-phantom-spawning-options.patch b/patches/server/0086-Add-phantom-spawning-options.patch index 25f1cb5e5..b7555c698 100644 --- a/patches/server/0086-Add-phantom-spawning-options.patch +++ b/patches/server/0086-Add-phantom-spawning-options.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 4861b11a7a21ecda93753feef034372648399822 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 3 Jul 2020 00:03:52 -0500 Subject: [PATCH] Add phantom spawning options diff --git a/src/main/java/net/minecraft/server/DifficultyDamageScaler.java b/src/main/java/net/minecraft/server/DifficultyDamageScaler.java -index 75745af34..84c0ec1b5 100644 +index 75745af3435434bddd420536ca3bbea3a9f181d6..84c0ec1b50758b433980765d087e15d8a8eaaaf7 100644 --- a/src/main/java/net/minecraft/server/DifficultyDamageScaler.java +++ b/src/main/java/net/minecraft/server/DifficultyDamageScaler.java @@ -13,6 +13,7 @@ public class DifficultyDamageScaler { @@ -25,7 +25,7 @@ index 75745af34..84c0ec1b5 100644 return this.b > f; } diff --git a/src/main/java/net/minecraft/server/EnumDifficulty.java b/src/main/java/net/minecraft/server/EnumDifficulty.java -index e0e72779c..386eae71a 100644 +index e0e72779c0f4e4856ed5682122fedf0321db11cb..386eae71a146e06ca60f8bf11429fe2131232a21 100644 --- a/src/main/java/net/minecraft/server/EnumDifficulty.java +++ b/src/main/java/net/minecraft/server/EnumDifficulty.java @@ -19,6 +19,7 @@ public enum EnumDifficulty { @@ -37,7 +37,7 @@ index e0e72779c..386eae71a 100644 return this.f; } diff --git a/src/main/java/net/minecraft/server/IBlockLightAccess.java b/src/main/java/net/minecraft/server/IBlockLightAccess.java -index 03a89301f..fa5eb188d 100644 +index 03a89301f2b3d29e39c6c9d05ee072527f652efc..fa5eb188da64cc1409cc614515e8c70b0a341dd0 100644 --- a/src/main/java/net/minecraft/server/IBlockLightAccess.java +++ b/src/main/java/net/minecraft/server/IBlockLightAccess.java @@ -12,6 +12,7 @@ public interface IBlockLightAccess extends IBlockAccess { @@ -49,7 +49,7 @@ index 03a89301f..fa5eb188d 100644 return this.getBrightness(EnumSkyBlock.SKY, blockposition) >= this.K(); } diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java -index 4e3f01bc7..ac1ea2f0c 100644 +index 4e3f01bc79b6ed2a322155f29f1d0dcf298c8b82..ac1ea2f0c15bccf94f203194a5a7b10ec125ffb8 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java @@ -1,85 +1,99 @@ @@ -221,7 +221,7 @@ index 4e3f01bc7..ac1ea2f0c 100644 } } diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 661ad8f8e..ee91c33a7 100644 +index 661ad8f8e67046211e001ea40d97660d7c88f8e5..ee91c33a7a2edca02caf5c71fd6429f97eac7e2d 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -385,6 +385,7 @@ public final class SpawnerCreature { @@ -233,7 +233,7 @@ index 661ad8f8e..ee91c33a7 100644 return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata)))); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ca4d260e8..a8571dae8 100644 +index ca4d260e8faf852b0986c4cd8645e5135afe6156..a8571dae8daefb557a8e3ee39c80ebc3b1b5aad9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1564,6 +1564,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -245,7 +245,7 @@ index ca4d260e8..a8571dae8 100644 public int c() { return this.d; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index dbeea1ece..813ce4cec 100644 +index dbeea1ecec72c84ba9648ea8c373d3e66dd220d6..813ce4cecbcf360d8c966cd183771a7cc3cd8571 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -343,10 +343,34 @@ public class PurpurWorldConfig { diff --git a/patches/server/0087-Implement-bed-explosion-options.patch b/patches/server/0087-Implement-bed-explosion-options.patch index f6cc8136b..fcf5ece6d 100644 --- a/patches/server/0087-Implement-bed-explosion-options.patch +++ b/patches/server/0087-Implement-bed-explosion-options.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From dedb711099874a538387027bb9a0b351e6657103 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 Jul 2020 13:12:43 -0500 Subject: [PATCH] Implement bed explosion options diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java -index 24a5c64b6..738535d01 100644 +index 24a5c64b65f0098b1395d352cc2f99bbbbaf9c94..738535d01adf8bfd895b5057e595042253f32f87 100644 --- a/src/main/java/net/minecraft/server/BlockBed.java +++ b/src/main/java/net/minecraft/server/BlockBed.java @@ -88,7 +88,7 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity { @@ -18,7 +18,7 @@ index 24a5c64b6..738535d01 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 813ce4cec..7b47c4023 100644 +index 813ce4cecbcf360d8c966cd183771a7cc3cd8571..7b47c40236cdde6c939e51de67e71a35117b8260 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -2,6 +2,7 @@ package net.pl3x.purpur; diff --git a/patches/server/0088-Implement-respawn-anchor-explosion-options.patch b/patches/server/0088-Implement-respawn-anchor-explosion-options.patch index d41009197..d6ccbaa81 100644 --- a/patches/server/0088-Implement-respawn-anchor-explosion-options.patch +++ b/patches/server/0088-Implement-respawn-anchor-explosion-options.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a8d8c7f6b63dc0d95fd53eddcd02194a876aec5f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 Jul 2020 13:23:19 -0500 Subject: [PATCH] Implement respawn anchor explosion options diff --git a/src/main/java/net/minecraft/server/BlockRespawnAnchor.java b/src/main/java/net/minecraft/server/BlockRespawnAnchor.java -index 21c5ad83a..521d161a3 100644 +index 21c5ad83a95bcd23071423c0e8336656b760fcde..521d161a3d015b641b61de21401c79ac20eb73a7 100644 --- a/src/main/java/net/minecraft/server/BlockRespawnAnchor.java +++ b/src/main/java/net/minecraft/server/BlockRespawnAnchor.java @@ -83,10 +83,7 @@ public class BlockRespawnAnchor extends Block { @@ -30,7 +30,7 @@ index 21c5ad83a..521d161a3 100644 public static boolean a(World world) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7b47c4023..91d7d123b 100644 +index 7b47c40236cdde6c939e51de67e71a35117b8260..91d7d123be1f5ffa12710bab56788b330dc3ba37 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -240,6 +240,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0089-Add-allow-water-in-end-world-option.patch b/patches/server/0089-Add-allow-water-in-end-world-option.patch index 56b6e1467..b552cfb86 100644 --- a/patches/server/0089-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0089-Add-allow-water-in-end-world-option.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 00595eff929220f1d8cf12c4bf51fb9f9f4bdb30 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 Jul 2020 23:40:16 -0500 Subject: [PATCH] Add allow water in end world option diff --git a/src/main/java/net/minecraft/server/BlockIce.java b/src/main/java/net/minecraft/server/BlockIce.java -index aba5c6b87..b75f6ded5 100644 +index aba5c6b8713c04302632bd1d289fd968c9e0607a..b75f6ded5d4bd3150789fba773a2c76c3e55bb90 100644 --- a/src/main/java/net/minecraft/server/BlockIce.java +++ b/src/main/java/net/minecraft/server/BlockIce.java @@ -13,7 +13,7 @@ public class BlockIce extends BlockHalfTransparent { @@ -27,7 +27,7 @@ index aba5c6b87..b75f6ded5 100644 } else { world.setTypeUpdate(blockposition, Blocks.WATER.getBlockData()); diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java -index 120bf8436..848a185c0 100644 +index 120bf8436fd82294c339add2e7bff1cda8311aea..848a185c04aa90a62e6bcc49ad68a7489ca28970 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -122,7 +122,7 @@ public class ItemBucket extends Item { @@ -49,7 +49,7 @@ index 120bf8436..848a185c0 100644 return true; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a8571dae8..7a82a894b 100644 +index a8571dae8daefb557a8e3ee39c80ebc3b1b5aad9..7a82a894bb3f737cc80f0b4b8d7a1b25ce1afc6c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1639,4 +1639,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -68,7 +68,7 @@ index a8571dae8..7a82a894b 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index f137d2a28..35e54a7df 100644 +index f137d2a2800fb82420c95b17bb7a93ea9bbc414d..35e54a7dfe88e33cb3e693194d300289469d3307 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,7 +1,6 @@ diff --git a/patches/server/0090-Allow-color-codes-in-books.patch b/patches/server/0090-Allow-color-codes-in-books.patch index b8bc50f80..477be7548 100644 --- a/patches/server/0090-Allow-color-codes-in-books.patch +++ b/patches/server/0090-Allow-color-codes-in-books.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a5a7533f5d4b2fc655a3b481092dbb0ed22ff1d2 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 3 Nov 2020 01:25:06 -0600 Subject: [PATCH] Allow color codes in books diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 7676659f4..bd206f181 100644 +index 7676659f44b84797aea0ffb4fc0ce6d934739e7b..bd206f1810283b409ea69cbfe471eadbef4b8ec2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1003,7 +1003,8 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0091-Entity-lifespan.patch b/patches/server/0091-Entity-lifespan.patch index 5305d1d21..e9b4af621 100644 --- a/patches/server/0091-Entity-lifespan.patch +++ b/patches/server/0091-Entity-lifespan.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 1433afc6b543faf91b1700a5bfb1094af8cfc676 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 11 Jul 2020 19:41:34 -0500 Subject: [PATCH] Entity lifespan diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 7a40f0864..1d5d87e61 100644 +index 7a40f0864677e54c3a0eca6dcb9a115864edfbbd..1d5d87e61946c674f61541455cf54018bfca1ecb 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -53,7 +53,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -92,7 +92,7 @@ index 7a40f0864..1d5d87e61 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index bd206f181..a57588acf 100644 +index bd206f1810283b409ea69cbfe471eadbef4b8ec2..a57588acf06802fbcf086dd1533bf9619d49e22f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2214,6 +2214,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -104,7 +104,7 @@ index bd206f181..a57588acf 100644 event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND); } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 91d7d123b..2f326f882 100644 +index 91d7d123be1f5ffa12710bab56788b330dc3ba37..2f326f88257f5a45deee872865211d15fc67fac6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -103,6 +103,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0092-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0092-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index f28031978..c294de75f 100644 --- a/patches/server/0092-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0092-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 926077b1e185af4de224ad4e7d55d8d5a001f554 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 13 Jul 2020 11:40:00 -0500 Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 27838680a..0d67c9c6c 100644 +index 4ffad61ce7ec81e9e329c117c9d122c51dbb4f69..6046b4788ba8f170e6f5fa021750936f108ab195 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -277,6 +277,7 @@ public abstract class EntityLiving extends Entity { @@ -17,7 +17,7 @@ index 27838680a..0d67c9c6c 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 36168d0f7..69be072e7 100644 +index 36168d0f7c730c636564808f4deb7cef42c35b64..69be072e7664dd8d54ad98300bdfbba3351dbeab 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -2366,4 +2366,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -48,7 +48,7 @@ index 36168d0f7..69be072e7 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2f326f882..73027d6ee 100644 +index 2f326f88257f5a45deee872865211d15fc67fac6..73027d6eed7b93fa8b9f580235259a262d50b96d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -178,6 +178,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0093-Squid-EAR-immunity.patch b/patches/server/0093-Squid-EAR-immunity.patch index 826621851..72b86a843 100644 --- a/patches/server/0093-Squid-EAR-immunity.patch +++ b/patches/server/0093-Squid-EAR-immunity.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 475ea2c7c8e356c71031819f09dee9abef08be42 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 13 Jul 2020 13:49:41 -0500 Subject: [PATCH] Squid EAR immunity diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 73027d6ee..de2d072b2 100644 +index 73027d6eed7b93fa8b9f580235259a262d50b96d..de2d072b24ca5f77f118a405add7ee62a2aacc8d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -444,6 +444,11 @@ public class PurpurWorldConfig { @@ -21,7 +21,7 @@ index 73027d6ee..de2d072b2 100644 public boolean villagerUseBrainTicksOnlyWhenLagging = true; public boolean villagerCanBeLeashed = false; diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index b47d6fa2d..ff0621e08 100644 +index b47d6fa2de3368d1afe329573bc18c3541bb7377..ff0621e08aaf058154f228abd46475ffaa3920cf 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -378,6 +378,7 @@ public class ActivationRange diff --git a/patches/server/0094-Configurable-end-spike-seed.patch b/patches/server/0094-Configurable-end-spike-seed.patch index 456110143..813f7b9d4 100644 --- a/patches/server/0094-Configurable-end-spike-seed.patch +++ b/patches/server/0094-Configurable-end-spike-seed.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 619abf1f4c400f567d3a01beb58958cf4bef56c1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 15 Jul 2020 11:49:36 -0500 Subject: [PATCH] Configurable end spike seed diff --git a/src/main/java/net/minecraft/server/WorldGenEnder.java b/src/main/java/net/minecraft/server/WorldGenEnder.java -index 00a170720..5eb9b3d35 100644 +index 00a1707209b21fc0163960c957864f798da15554..5eb9b3d35e12c2d3dc5f158cbed0b0a0853ee116 100644 --- a/src/main/java/net/minecraft/server/WorldGenEnder.java +++ b/src/main/java/net/minecraft/server/WorldGenEnder.java @@ -23,12 +23,14 @@ public class WorldGenEnder extends WorldGenerator list = worldgenfeatureendspikeconfiguration.c(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 35e54a7df..5405928a6 100644 +index 35e54a7dfe88e33cb3e693194d300289469d3307..5405928a681d4de0b47952c9c917e0037093df8c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0095-Configurable-dungeon-seed.patch b/patches/server/0095-Configurable-dungeon-seed.patch index 1614fc470..c28a1c1c0 100644 --- a/patches/server/0095-Configurable-dungeon-seed.patch +++ b/patches/server/0095-Configurable-dungeon-seed.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From c7b6386c8d6ca901db96d365fcc738fac3d86518 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 15 Jul 2020 12:40:25 -0500 Subject: [PATCH] Configurable dungeon seed diff --git a/src/main/java/net/minecraft/server/WorldGenDungeons.java b/src/main/java/net/minecraft/server/WorldGenDungeons.java -index 07f7b69fe..6aa1626f3 100644 +index 07f7b69fefe66ec4f26ca7b4fb3b752e80aeed07..6aa1626f38df0cd8ae8a417dc4fca213b82664c9 100644 --- a/src/main/java/net/minecraft/server/WorldGenDungeons.java +++ b/src/main/java/net/minecraft/server/WorldGenDungeons.java @@ -11,12 +11,21 @@ public class WorldGenDungeons extends WorldGenerator Date: Sun, 12 Apr 2020 20:41:59 -0700 Subject: [PATCH] Phantoms burn in light diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index dfce36368..bdfe073dc 100644 +index dfce36368da9bdd9285c490a802f7a0cc4a339f6..bdfe073dcd255a7359127f9ae3a962642be5526d 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -13,6 +13,7 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -48,7 +48,7 @@ index dfce36368..bdfe073dc 100644 return false; } else { diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java -index 4c379916d..ea6b61c9b 100644 +index 4c379916d8d7797038d2980761c49f44c010dea8..ea6b61c9b88f33d29f7266d7614c80372db31b72 100644 --- a/src/main/java/net/minecraft/server/Items.java +++ b/src/main/java/net/minecraft/server/Items.java @@ -173,7 +173,7 @@ public class Items { @@ -70,7 +70,7 @@ index 4c379916d..ea6b61c9b 100644 public static final Item dr = a(Blocks.JACK_O_LANTERN, CreativeModeTab.b); public static final Item ds = a(Blocks.OAK_TRAPDOOR, CreativeModeTab.d); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index de2d072b2..a3568dfbe 100644 +index de2d072b24ca5f77f118a405add7ee62a2aacc8d..a3568dfbe10c01a5e6c6497e22069b0cd5a89571 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -399,6 +399,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0097-Configurable-villager-breeding.patch b/patches/server/0097-Configurable-villager-breeding.patch index 65e136058..29a96e7b0 100644 --- a/patches/server/0097-Configurable-villager-breeding.patch +++ b/patches/server/0097-Configurable-villager-breeding.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 4ae9318a95074c43ab4e066c2622c728301169a2 Mon Sep 17 00:00:00 2001 From: draycia Date: Tue, 31 Mar 2020 23:48:55 -0700 Subject: [PATCH] Configurable villager breeding diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 894089d66..5d37cb14f 100644 +index 894089d665e97da31c04c82aaae344b22f83de89..5d37cb14f9cb7e3a1491a3dbcf2129268572aa28 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -642,7 +642,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -18,7 +18,7 @@ index 894089d66..5d37cb14f 100644 private boolean fr() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a3568dfbe..22a79a530 100644 +index a3568dfbe10c01a5e6c6497e22069b0cd5a89571..22a79a530a92f334a29bed0fe8186077fd57f723 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -462,6 +462,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0098-Redstone-deactivates-spawners.patch b/patches/server/0098-Redstone-deactivates-spawners.patch index 2b66c2c1b..378fb9c28 100644 --- a/patches/server/0098-Redstone-deactivates-spawners.patch +++ b/patches/server/0098-Redstone-deactivates-spawners.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 007353439714be0d7df7fa866bd4513fcd413e09 Mon Sep 17 00:00:00 2001 From: draycia Date: Tue, 14 Apr 2020 00:35:12 -0700 Subject: [PATCH] Redstone deactivates spawners diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index c2e830db7..3b4cc9871 100644 +index c2e830db7aa2944a477624e149a3ba66d112b68a..3b4cc9871c123cfd134783745145c407bbccea0f 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -51,6 +51,7 @@ public abstract class MobSpawnerAbstract { @@ -26,7 +26,7 @@ index c2e830db7..3b4cc9871 100644 public abstract BlockPosition b(); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 22a79a530..ec84ec529 100644 +index 22a79a530a92f334a29bed0fe8186077fd57f723..ec84ec5297e2f16daa0d343fd3cbac6a4604c13a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -273,6 +273,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0099-Totems-work-in-inventory.patch b/patches/server/0099-Totems-work-in-inventory.patch index 132c73425..e964c63c1 100644 --- a/patches/server/0099-Totems-work-in-inventory.patch +++ b/patches/server/0099-Totems-work-in-inventory.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d5096a48bdd5e14bc69aa686aaeafd6157517332 Mon Sep 17 00:00:00 2001 From: draycia Date: Wed, 29 Apr 2020 00:45:58 -0700 Subject: [PATCH] Totems work in inventory diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 0d67c9c6c..0fe6f90ea 100644 +index 6046b4788ba8f170e6f5fa021750936f108ab195..3ae8296c29f85d7713ce3186ca463939256d7cda 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1318,6 +1318,19 @@ public abstract class EntityLiving extends Entity { @@ -29,7 +29,7 @@ index 0d67c9c6c..0fe6f90ea 100644 event.setCancelled(itemstack == null); this.world.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ec84ec529..48c8cbf95 100644 +index ec84ec5297e2f16daa0d343fd3cbac6a4604c13a..48c8cbf95be6bea2ceec48fe33d4219eab65bc0c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -183,6 +183,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0100-Fix-death-message-colors.patch b/patches/server/0100-Fix-death-message-colors.patch index 9aa9e182b..20fe4274d 100644 --- a/patches/server/0100-Fix-death-message-colors.patch +++ b/patches/server/0100-Fix-death-message-colors.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 013791d4483a04fc67a1edff063c9527a17e4bde Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 19 Jul 2020 14:08:33 -0500 Subject: [PATCH] Fix death message colors diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 69be072e7..05f9a8185 100644 +index 69be072e7664dd8d54ad98300bdfbba3351dbeab..05f9a8185489434d274301ba0a62213a5ea0ef3f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -839,7 +839,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0101-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch b/patches/server/0101-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch index b7522e231..0189ad7a1 100644 --- a/patches/server/0101-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch +++ b/patches/server/0101-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f1e3e7a5d564eef5ea8172430e553d0cc9e9ef7b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 19 Jul 2020 15:30:50 -0500 Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync @@ -6,7 +6,7 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a57588acf..261dbea12 100644 +index a57588acf06802fbcf086dd1533bf9619d49e22f..261dbea122b092afb413e034f2cefec8002941c7 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1973,7 +1973,15 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0102-Populator-seed-controls.patch b/patches/server/0102-Populator-seed-controls.patch index e50f84ccd..592f5e638 100644 --- a/patches/server/0102-Populator-seed-controls.patch +++ b/patches/server/0102-Populator-seed-controls.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 98322a35b7e76912f17c7bd42fc6de51630df155 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 18 Jul 2020 11:27:43 -0500 Subject: [PATCH] Populator seed controls diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index dae2e5d70..55b67f105 100644 +index dae2e5d70756c5b61163d57099b65f7e415b288c..55b67f1057224101272f9d6023a93872c4423405 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -293,7 +293,7 @@ public class TimingsExport extends Thread { @@ -18,7 +18,7 @@ index dae2e5d70..55b67f105 100644 } final Object val = config.get(key); diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java -index 42ce3b802..03e4d9d8b 100644 +index 42ce3b80217b574a1852e12f500b366a912e23e2..03e4d9d8bd29587492afbaab9400f3ae1e5e6dea 100644 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java @@ -1,5 +1,6 @@ @@ -50,7 +50,7 @@ index 42ce3b802..03e4d9d8b 100644 } \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index 0854ac9ef..df6874c1c 100644 +index 0854ac9ef586b378420d9899f3afd2755e6f9f33..df6874c1cf5fc5764dc575866aab87883b6cf035 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -189,6 +189,10 @@ public final class BiomeBase { diff --git a/patches/server/0103-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0103-Add-vindicator-johnny-spawn-chance.patch index e7748c7eb..ab23f854e 100644 --- a/patches/server/0103-Add-vindicator-johnny-spawn-chance.patch +++ b/patches/server/0103-Add-vindicator-johnny-spawn-chance.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7be5dc3cb33424b636ac97e97b96aa886217c2d6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 24 Jul 2020 19:38:21 -0500 Subject: [PATCH] Add vindicator johnny spawn chance diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index c0d26aa9d..8f812aa91 100644 +index c0d26aa9dcd02c44d744b10e18609857ada95889..8f812aa9133e29d1450ab210fec68b23ca4d3042 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -81,6 +81,12 @@ public class EntityVindicator extends EntityIllagerAbstract { @@ -22,7 +22,7 @@ index c0d26aa9d..8f812aa91 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 48c8cbf95..a26529e93 100644 +index 48c8cbf95be6bea2ceec48fe33d4219eab65bc0c..a26529e932d442c9c9f4ca6a7eff5e3c5f842190 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -40,6 +40,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0104-DragonEggPlaceEvent.patch b/patches/server/0104-DragonEggPlaceEvent.patch index 043d7e233..db618a13c 100644 --- a/patches/server/0104-DragonEggPlaceEvent.patch +++ b/patches/server/0104-DragonEggPlaceEvent.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From b3d70e1fb0a7afd774048f3fd4bb34ea8ca7561f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 30 Jul 2020 18:15:13 -0500 Subject: [PATCH] DragonEggPlaceEvent diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java -index f853f6c42..5199cba87 100644 +index f853f6c424da77c40ee3d5b5dc2279ba8918977c..5199cba870a6ea004ee72ce225a0b6f483aed2ed 100644 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java @@ -359,7 +359,13 @@ public class EnderDragonBattle { diff --git a/patches/server/0105-Add-option-to-disable-mushroom-block-updates.patch b/patches/server/0105-Add-option-to-disable-mushroom-block-updates.patch index 5143a842f..d58ec87f2 100644 --- a/patches/server/0105-Add-option-to-disable-mushroom-block-updates.patch +++ b/patches/server/0105-Add-option-to-disable-mushroom-block-updates.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 03c978775494f7d6d3d887f4f82bc898148eccce Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 4 Aug 2020 17:11:58 -0500 Subject: [PATCH] Add option to disable mushroom block updates diff --git a/src/main/java/net/minecraft/server/BlockHugeMushroom.java b/src/main/java/net/minecraft/server/BlockHugeMushroom.java -index e8f340b9f..3490af6fe 100644 +index e8f340b9f2a1e5de9cf7e8cf595de8a806cb528a..3490af6fe0cf2eccac9753778cf4085f95d5da93 100644 --- a/src/main/java/net/minecraft/server/BlockHugeMushroom.java +++ b/src/main/java/net/minecraft/server/BlockHugeMushroom.java @@ -14,30 +14,57 @@ public class BlockHugeMushroom extends Block { @@ -73,7 +73,7 @@ index e8f340b9f..3490af6fe 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 37f666251..46d99d1e7 100644 +index 37f666251e2a8cc84484a70ed64c2725cc3e7eb3..46d99d1e7b10aa63f064e2016a5ca53a5290397a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -205,6 +205,11 @@ public class PurpurConfig { diff --git a/patches/server/0106-Dispensers-place-anvils-option.patch b/patches/server/0106-Dispensers-place-anvils-option.patch index f9361636c..282099e49 100644 --- a/patches/server/0106-Dispensers-place-anvils-option.patch +++ b/patches/server/0106-Dispensers-place-anvils-option.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From ad538d4a88c49c3e1d1f5a40492058120dfbbdee Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 4 Aug 2020 21:11:03 -0500 Subject: [PATCH] Dispensers place anvils option diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java -index c9963c198..e3ba447eb 100644 +index c9963c19892c3e408964b72983bc6e26f8b63b67..e3ba447eb7f3023406b71aab97e3d30523540588 100644 --- a/src/main/java/net/minecraft/server/EnumDirection.java +++ b/src/main/java/net/minecraft/server/EnumDirection.java @@ -102,6 +102,7 @@ public enum EnumDirection implements INamable { @@ -33,7 +33,7 @@ index c9963c198..e3ba447eb 100644 return this.k; } diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java -index 7b8a470d9..d1f9d2884 100644 +index 7b8a470d97ccf0fdcdb8eef9368195486e09913b..d1f9d2884d055efbe72b01f86b0bdaf13ed122a5 100644 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java @@ -915,6 +915,23 @@ public interface IDispenseBehavior { @@ -61,7 +61,7 @@ index 7b8a470d9..d1f9d2884 100644 static void a(ISourceBlock isourceblock, Entity entity, EnumDirection enumdirection) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a26529e93..73969ac44 100644 +index a26529e932d442c9c9f4ca6a7eff5e3c5f842190..73969ac4480594b5c78cdb2c30fa4d49370a6a6d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -240,8 +240,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0107-Allow-anvil-colors.patch b/patches/server/0107-Allow-anvil-colors.patch index 221bb112c..a4eb9dc22 100644 --- a/patches/server/0107-Allow-anvil-colors.patch +++ b/patches/server/0107-Allow-anvil-colors.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 3cd09e9bda8427721278f0d3ade605995f0486f1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 4 Aug 2020 22:08:23 -0500 Subject: [PATCH] Allow anvil colors diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java -index 4aa6b035a..5e4e59e5c 100644 +index 4aa6b035a6a8ea39401c6566cd286de39f60e942..5e4e59e5c8478b76078fdda14e5ced76304d489c 100644 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java @@ -251,6 +251,25 @@ public class ContainerAnvil extends ContainerAnvilAbstract { @@ -35,7 +35,7 @@ index 4aa6b035a..5e4e59e5c 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 73969ac44..876a51801 100644 +index 73969ac4480594b5c78cdb2c30fa4d49370a6a6d..876a51801f6acdbc062de743106c5a63ed94b13c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -216,6 +216,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0108-Add-no-tick-block-list.patch b/patches/server/0108-Add-no-tick-block-list.patch index ecfa59092..5c7894327 100644 --- a/patches/server/0108-Add-no-tick-block-list.patch +++ b/patches/server/0108-Add-no-tick-block-list.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 5f1ca7ee542dc1fde7258e93c934aef539281e3c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 7 Aug 2020 12:53:36 -0500 Subject: [PATCH] Add no-tick block list diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java -index 4d1ac4e6b..483756316 100644 +index 4d1ac4e6b61897fc03b091475ef7be3ed0b228a9..483756316a51780da2122b68e73ffc5fc9d87df3 100644 --- a/src/main/java/net/minecraft/server/BlockBase.java +++ b/src/main/java/net/minecraft/server/BlockBase.java @@ -655,10 +655,12 @@ public abstract class BlockBase { @@ -22,7 +22,7 @@ index 4d1ac4e6b..483756316 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 03dc6ab4b..66883ea89 100644 +index e26fc1a6032027d16e72931c8329196b683774ba..9d93a8c86b675cf55210724a0b695f960b009d69 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -314,14 +314,14 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -43,7 +43,7 @@ index 03dc6ab4b..66883ea89 100644 this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> { return fluidtype == null || fluidtype == FluidTypes.EMPTY; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 876a51801..4b96afcbf 100644 +index 876a51801f6acdbc062de743106c5a63ed94b13c..4b96afcbf503d91c8dc7551dd8dfe445ffc5712b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -11,8 +11,10 @@ import org.bukkit.configuration.ConfigurationSection; diff --git a/patches/server/0109-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0109-Add-option-to-disable-dolphin-treasure-searching.patch index 19805b113..9c099b3db 100644 --- a/patches/server/0109-Add-option-to-disable-dolphin-treasure-searching.patch +++ b/patches/server/0109-Add-option-to-disable-dolphin-treasure-searching.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From fd9b9498d7ceb33eb19776e46121864f9f6e2ef3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 8 Aug 2020 16:11:51 -0500 Subject: [PATCH] Add option to disable dolphin treasure searching diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java -index 2916ee89e..664f96933 100644 +index 2916ee89ef7a14619703dfbe7efd5c78a2f34337..664f9693368852bfb06a7a3bd0862a10cbc81747 100644 --- a/src/main/java/net/minecraft/server/EntityDolphin.java +++ b/src/main/java/net/minecraft/server/EntityDolphin.java @@ -329,6 +329,7 @@ public class EntityDolphin extends EntityWaterAnimal { @@ -17,7 +17,7 @@ index 2916ee89e..664f96933 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4b96afcbf..9c7dec1b4 100644 +index 4b96afcbf503d91c8dc7551dd8dfe445ffc5712b..9c7dec1b4ed0651a318f7234b8f075a923e78484 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -342,6 +342,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0110-Short-enderman-height.patch b/patches/server/0110-Short-enderman-height.patch index 87fd0ef95..06cbf4970 100644 --- a/patches/server/0110-Short-enderman-height.patch +++ b/patches/server/0110-Short-enderman-height.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a94d2bc0ed72c18407809d424ddefc2f13340bc6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 10 Aug 2020 21:46:22 -0500 Subject: [PATCH] Short enderman height diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 7b175240e..e33640326 100644 +index 7b175240e44b0c7eb5044d7bcaf54dac22f50f2a..e3364032669b473c799b759f5f89468b7584d9f5 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -321,6 +321,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { @@ -17,7 +17,7 @@ index 7b175240e..e33640326 100644 if (this.tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start for (int i = 0; i < 64; ++i) { diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 37b984a5b..7a35a367a 100644 +index 37b984a5b6c1c6e146e1c4b0947d1e39a051cfbb..7a35a367a5840fd5df72b0bd64e630197562f160 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -34,7 +34,7 @@ public class EntityTypes { @@ -30,7 +30,7 @@ index 37b984a5b..7a35a367a 100644 public static final EntityTypes EVOKER = a("evoker", EntityTypes.Builder.a(EntityEvoker::new, EnumCreatureType.MONSTER).a(0.6F, 1.95F).trackingRange(8)); public static final EntityTypes EVOKER_FANGS = a("evoker_fangs", EntityTypes.Builder.a(EntityEvokerFangs::new, EnumCreatureType.MISC).a(0.5F, 0.8F).trackingRange(6).updateInterval(2)); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 46d99d1e7..f75df9990 100644 +index 46d99d1e7b10aa63f064e2016a5ca53a5290397a..f75df999005e4d2bab4df82531a37fc914d84175 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -190,6 +190,11 @@ public class PurpurConfig { diff --git a/patches/server/0111-Stop-squids-floating-on-top-of-water.patch b/patches/server/0111-Stop-squids-floating-on-top-of-water.patch index e8c3045ee..e00f489b5 100644 --- a/patches/server/0111-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0111-Stop-squids-floating-on-top-of-water.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 27130e957dee263b444023e306ef4fb050c93aad Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 13 Aug 2020 04:00:26 -0500 Subject: [PATCH] Stop squids floating on top of water diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 974e75945..9679722a5 100644 +index 477e95ebecea183a2ad3d1daac3b4010b7263c99..a12bcda00cb615b0832157f633c4a987e78c8404 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -3438,8 +3438,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -24,7 +24,7 @@ index 974e75945..9679722a5 100644 int j = MathHelper.f(axisalignedbb.maxX); int k = MathHelper.floor(axisalignedbb.minY); diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index b21605a62..148e4b158 100644 +index b21605a62365fe24f315f35bd840b4740fc80f0e..148e4b158734f136832e5c17bdc69634c0f294aa 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -25,6 +25,14 @@ public class EntitySquid extends EntityWaterAnimal { @@ -43,7 +43,7 @@ index b21605a62..148e4b158 100644 protected void initPathfinder() { this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9c7dec1b4..5cc717c8d 100644 +index 9c7dec1b4ed0651a318f7234b8f075a923e78484..5cc717c8d3829a1503fd53ae06f433a6e8f14894 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -490,8 +490,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0112-Ridables.patch b/patches/server/0112-Ridables.patch index 5753e439d..7ebb11554 100644 --- a/patches/server/0112-Ridables.patch +++ b/patches/server/0112-Ridables.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a46473b34ae5d998def4dde1c75aa125083ae58a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 Jul 2020 22:19:49 -0500 Subject: [PATCH] Ridables diff --git a/src/main/java/net/minecraft/server/AttributeDefaults.java b/src/main/java/net/minecraft/server/AttributeDefaults.java -index 8f95a4e49..ab05b5e40 100644 +index 8f95a4e49714e352b9cdf82d7f4acdd3459978ad..ab05b5e403cf54756aa35891dc0d950187a9d4ec 100644 --- a/src/main/java/net/minecraft/server/AttributeDefaults.java +++ b/src/main/java/net/minecraft/server/AttributeDefaults.java @@ -9,7 +9,80 @@ import org.apache.logging.log4j.Logger; @@ -91,7 +91,7 @@ index 8f95a4e49..ab05b5e40 100644 public static AttributeProvider a(EntityTypes entitytypes) { return (AttributeProvider) AttributeDefaults.b.get(entitytypes); diff --git a/src/main/java/net/minecraft/server/AttributeProvider.java b/src/main/java/net/minecraft/server/AttributeProvider.java -index dd235a6fc..ac902c614 100644 +index dd235a6fc4bc731a344d7211879f9b40bb622c3e..ac902c614dd3054f1a09298a42a88248b69552cd 100644 --- a/src/main/java/net/minecraft/server/AttributeProvider.java +++ b/src/main/java/net/minecraft/server/AttributeProvider.java @@ -101,6 +101,7 @@ public class AttributeProvider { @@ -103,7 +103,7 @@ index dd235a6fc..ac902c614 100644 this.b = true; return new AttributeProvider(this.a); diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java -index e5bdddfc1..8200ba60b 100644 +index e5bdddfc14b36b3a7b72ca92a9a14245fddb8833..8200ba60b7642a49742809a9c2e2ab7587259a71 100644 --- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java +++ b/src/main/java/net/minecraft/server/ControllerLookDolphin.java @@ -1,6 +1,6 @@ @@ -124,7 +124,7 @@ index e5bdddfc1..8200ba60b 100644 this.d = false; this.a.aC = this.a(this.a.aC, this.h() + 20.0F, this.b); diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java -index 8f9fb058c..eaf446946 100644 +index 8f9fb058c11ba5c2e887df048025284cd834ffe9..eaf44694683685e06dd1f012699e5c9d1f91c850 100644 --- a/src/main/java/net/minecraft/server/ControllerMove.java +++ b/src/main/java/net/minecraft/server/ControllerMove.java @@ -6,9 +6,9 @@ public class ControllerMove { @@ -141,7 +141,7 @@ index 8f9fb058c..eaf446946 100644 public ControllerMove(EntityInsentient entityinsentient) { diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java -index bd0267ee4..8b36ac2b0 100644 +index bd0267ee4b3782f6d1ec39cba7966ba4f62f1adf..8b36ac2b0950a827763aa2357700f37eec5d00d3 100644 --- a/src/main/java/net/minecraft/server/DamageSource.java +++ b/src/main/java/net/minecraft/server/DamageSource.java @@ -56,6 +56,7 @@ public class DamageSource { @@ -161,7 +161,7 @@ index bd0267ee4..8b36ac2b0 100644 this.B = true; return this; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9679722a5..7e379aa14 100644 +index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d42784775fb1626e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -327,7 +327,7 @@ index 9679722a5..7e379aa14 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java -index 0a59e02d7..bdf4e798a 100644 +index 0a59e02d762a096cb3de62e0f8105cc5a5fab8d4..bdf4e798ac8ca27edebd0122b894d15a76ecb9d0 100644 --- a/src/main/java/net/minecraft/server/EntityBat.java +++ b/src/main/java/net/minecraft/server/EntityBat.java @@ -14,9 +14,48 @@ public class EntityBat extends EntityAmbient { @@ -403,7 +403,7 @@ index 0a59e02d7..bdf4e798a 100644 BlockPosition blockposition = this.getChunkCoordinates(); BlockPosition blockposition1 = blockposition.up(); diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index f73641ddb..d8354ec4d 100644 +index f73641ddb3e82bc653732105ef0a3d41a28e845f..d8354ec4d19fc3fbddc2551ee217acb137482e63 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -37,6 +37,7 @@ public class EntityBee extends EntityAnimal implements IEntityAngerable, EntityB @@ -534,7 +534,7 @@ index f73641ddb..d8354ec4d 100644 } diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java -index 74082136b..dcfad16e0 100644 +index 74082136b38491a0a50d152c455edfa61a6afb9f..dcfad16e06450068d5801fc002c9650102dbf995 100644 --- a/src/main/java/net/minecraft/server/EntityBlaze.java +++ b/src/main/java/net/minecraft/server/EntityBlaze.java @@ -10,6 +10,7 @@ public class EntityBlaze extends EntityMonster { @@ -614,7 +614,7 @@ index 74082136b..dcfad16e0 100644 if (this.c <= 0) { this.c = 100; diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index 57166a543..05929d5c5 100644 +index 57166a543a9af9e10e38c983487fac7ea9d42d52..05929d5c539a738e6b6e8d32d9b0f843a665f4f6 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -41,6 +41,25 @@ public class EntityCat extends EntityTameableAnimal { @@ -694,7 +694,7 @@ index 57166a543..05929d5c5 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java -index 776f3d25a..2e1f2dec1 100644 +index 776f3d25a6eeb5e97667dd06c062d1045d1afa81..2e1f2dec17e7761b6534f29bbec813d135250e4f 100644 --- a/src/main/java/net/minecraft/server/EntityCaveSpider.java +++ b/src/main/java/net/minecraft/server/EntityCaveSpider.java @@ -8,6 +8,18 @@ public class EntityCaveSpider extends EntitySpider { @@ -717,7 +717,7 @@ index 776f3d25a..2e1f2dec1 100644 return EntitySpider.eK().a(GenericAttributes.MAX_HEALTH, 12.0D); } diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java -index 11a612fa3..a16ecd7ed 100644 +index 11a612fa390cb0acf37fb84c5d5b6ea926dabad3..a16ecd7edcd0ed081fff254d1f1429b32a4dcfb3 100644 --- a/src/main/java/net/minecraft/server/EntityChicken.java +++ b/src/main/java/net/minecraft/server/EntityChicken.java @@ -18,6 +18,16 @@ public class EntityChicken extends EntityAnimal { @@ -754,7 +754,7 @@ index 11a612fa3..a16ecd7ed 100644 } else { this.goalSelector.a(1, new PathfinderGoalPanic(this, 1.4D)); diff --git a/src/main/java/net/minecraft/server/EntityCod.java b/src/main/java/net/minecraft/server/EntityCod.java -index 9a99af6e9..039fae4c2 100644 +index 9a99af6e9cec9679af07ab6017f9beb427fa88ad..039fae4c29648afa85ea1b27d82cfe51c4165315 100644 --- a/src/main/java/net/minecraft/server/EntityCod.java +++ b/src/main/java/net/minecraft/server/EntityCod.java @@ -6,6 +6,18 @@ public class EntityCod extends EntityFishSchool { @@ -777,7 +777,7 @@ index 9a99af6e9..039fae4c2 100644 protected ItemStack eK() { return new ItemStack(Items.COD_BUCKET); diff --git a/src/main/java/net/minecraft/server/EntityComplexPart.java b/src/main/java/net/minecraft/server/EntityComplexPart.java -index c1b1bd123..26ff230ef 100644 +index c1b1bd123e7a18d37fd55cacc29ebca32030e5f0..26ff230ef774999bfe37b3327a7cf711799cbf2f 100644 --- a/src/main/java/net/minecraft/server/EntityComplexPart.java +++ b/src/main/java/net/minecraft/server/EntityComplexPart.java @@ -47,4 +47,11 @@ public class EntityComplexPart extends Entity { @@ -793,7 +793,7 @@ index c1b1bd123..26ff230ef 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index cfb009c81..1219b0aa9 100644 +index cfb009c811bd2908d38da1b0007cb7aaed4e42c3..1219b0aa9c62bc9a1bda45cc9e9a27f14a28fe2e 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -11,9 +11,22 @@ public class EntityCow extends EntityAnimal { @@ -877,7 +877,7 @@ index cfb009c81..1219b0aa9 100644 this.world.addEntity(mooshroom); this.die(); diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 2256b8162..d186f257f 100644 +index 2256b81624b12b6f6cb54250b24fa12ad6da621d..d186f257fa3bc613be7ec79cd6a6ff2e747cba78 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -18,12 +18,27 @@ public class EntityCreeper extends EntityMonster { @@ -995,7 +995,7 @@ index 2256b8162..d186f257f 100644 } // Paper end diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java -index 664f96933..9d5d143a9 100644 +index 664f9693368852bfb06a7a3bd0862a10cbc81747..9d5d143a997b74e0777bb79bf14d341ad5340db9 100644 --- a/src/main/java/net/minecraft/server/EntityDolphin.java +++ b/src/main/java/net/minecraft/server/EntityDolphin.java @@ -17,6 +17,7 @@ public class EntityDolphin extends EntityWaterAnimal { @@ -1128,7 +1128,7 @@ index 664f96933..9d5d143a9 100644 this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D)); } diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 1a1028169..125eab60f 100644 +index 1a102816921fa3b40f6d364bb826db4459f68eb2..125eab60f2b4657e52a71eddf7586c574945252e 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -22,6 +22,16 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -1184,7 +1184,7 @@ index 1a1028169..125eab60f 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index a5a218245..17a9217ed 100644 +index a5a2182455542bb8fd62941bd0da2f38ba698f35..17a9217ed2d1677371d12b4ab0552378cd71652f 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -46,6 +46,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -1335,7 +1335,7 @@ index a5a218245..17a9217ed 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index e33640326..995849212 100644 +index e3364032669b473c799b759f5f89468b7584d9f5..995849212c25568d3aa28ada78babf8b8e669960 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -30,9 +30,22 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { @@ -1403,7 +1403,7 @@ index e33640326..995849212 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java -index fcebf3631..7eef7f523 100644 +index fcebf36312c95df876652d18cf27bf1cc6589226..7eef7f523a17434b38492006526920a955fc9120 100644 --- a/src/main/java/net/minecraft/server/EntityEndermite.java +++ b/src/main/java/net/minecraft/server/EntityEndermite.java @@ -12,14 +12,28 @@ public class EntityEndermite extends EntityMonster { @@ -1437,7 +1437,7 @@ index fcebf3631..7eef7f523 100644 } diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java -index f40fbef32..c75dc7561 100644 +index f40fbef32f2fc1f37f2065ad598f013766cf12f2..c75dc75611991028e9de6db7c57304e913251a6b 100644 --- a/src/main/java/net/minecraft/server/EntityEvoker.java +++ b/src/main/java/net/minecraft/server/EntityEvoker.java @@ -12,10 +12,23 @@ public class EntityEvoker extends EntityIllagerWizard { @@ -1497,7 +1497,7 @@ index f40fbef32..c75dc7561 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java -index 9b8456440..668f9d61b 100644 +index 9b84564401e30a7a2aafae023a1eb3b2eda3f112..668f9d61b72cf0d8e7bb0d1cd985ae653a587466 100644 --- a/src/main/java/net/minecraft/server/EntityFish.java +++ b/src/main/java/net/minecraft/server/EntityFish.java @@ -70,13 +70,12 @@ public abstract class EntityFish extends EntityWaterAnimal { @@ -1559,7 +1559,7 @@ index 9b8456440..668f9d61b 100644 this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D)); } diff --git a/src/main/java/net/minecraft/server/EntityFishSchool.java b/src/main/java/net/minecraft/server/EntityFishSchool.java -index 08372b722..6a8e15f01 100644 +index 08372b72262f2ef6e6c95f34e889e04faf731329..6a8e15f01606024aba43d57d270e09db307a9c3f 100644 --- a/src/main/java/net/minecraft/server/EntityFishSchool.java +++ b/src/main/java/net/minecraft/server/EntityFishSchool.java @@ -16,7 +16,7 @@ public abstract class EntityFishSchool extends EntityFish { @@ -1572,7 +1572,7 @@ index 08372b722..6a8e15f01 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index 8845afd83..f5defe471 100644 +index 8845afd83d47902d5192ec1a9146b6f20c5667d3..f5defe4713c6be7d32fb2116110516717460284e 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -55,6 +55,39 @@ public class EntityFox extends EntityAnimal { @@ -1696,7 +1696,7 @@ index 8845afd83..f5defe471 100644 } diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java -index a67611c4f..216506a7b 100644 +index a67611c4f9271c116a795ee598412f25396fee88..216506a7b1f97b776ecd4e24f5b2afaf5b79ec2d 100644 --- a/src/main/java/net/minecraft/server/EntityGhast.java +++ b/src/main/java/net/minecraft/server/EntityGhast.java @@ -14,11 +14,42 @@ public class EntityGhast extends EntityFlying implements IMonster { @@ -1770,7 +1770,7 @@ index a67611c4f..216506a7b 100644 if (this.j-- <= 0) { this.j += this.i.getRandom().nextInt(5) + 2; diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java -index cf899bb6a..93fcf801a 100644 +index cf899bb6a5bd9d913ea90facdd5f3cc0dda1e9d2..93fcf801aa7a34ba8b4b72d87c2e093cbcef97b8 100644 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java @@ -11,16 +11,28 @@ public class EntityGiantZombie extends EntityMonster { @@ -1803,7 +1803,7 @@ index cf899bb6a..93fcf801a 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillager.class, false)); diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java -index 27ec46c0b..0a7f51a2a 100644 +index 27ec46c0b2e7df985ed4c68a973db18f81caac89..0a7f51a2a1cb10438c9364faf3e4adc6322fc787 100644 --- a/src/main/java/net/minecraft/server/EntityGuardian.java +++ b/src/main/java/net/minecraft/server/EntityGuardian.java @@ -24,15 +24,36 @@ public class EntityGuardian extends EntityMonster { @@ -1899,7 +1899,7 @@ index 27ec46c0b..0a7f51a2a 100644 Vec3D vec3d = new Vec3D(this.b - this.i.locX(), this.c - this.i.locY(), this.d - this.i.locZ()); double d0 = vec3d.f(); diff --git a/src/main/java/net/minecraft/server/EntityGuardianElder.java b/src/main/java/net/minecraft/server/EntityGuardianElder.java -index b691e8449..f6f882746 100644 +index b691e844953bcc2853a806a3bbf9cb7338e98266..f6f882746940c9e049106aa9b41591ba27a608ce 100644 --- a/src/main/java/net/minecraft/server/EntityGuardianElder.java +++ b/src/main/java/net/minecraft/server/EntityGuardianElder.java @@ -16,6 +16,18 @@ public class EntityGuardianElder extends EntityGuardian { @@ -1922,7 +1922,7 @@ index b691e8449..f6f882746 100644 return EntityGuardian.eM().a(GenericAttributes.MOVEMENT_SPEED, 0.30000001192092896D).a(GenericAttributes.ATTACK_DAMAGE, 8.0D).a(GenericAttributes.MAX_HEALTH, 80.0D); } diff --git a/src/main/java/net/minecraft/server/EntityHoglin.java b/src/main/java/net/minecraft/server/EntityHoglin.java -index f67979253..548ff4449 100644 +index f6797925365836b6c2d3d2c48c746a4d58e28bf3..548ff4449faca0abdf72487276fe49207bacfe17 100644 --- a/src/main/java/net/minecraft/server/EntityHoglin.java +++ b/src/main/java/net/minecraft/server/EntityHoglin.java @@ -13,13 +13,25 @@ public class EntityHoglin extends EntityAnimal implements IMonster, IOglin { @@ -1979,7 +1979,7 @@ index f67979253..548ff4449 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java -index e0e60bb6d..0415a4d1f 100644 +index e0e60bb6d853e27a3495a8de9018e547a68ff726..0415a4d1f328f117ee676156114acb3599aec202 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java @@ -12,6 +12,13 @@ public class EntityHorse extends EntityHorseAbstract { @@ -1997,7 +1997,7 @@ index e0e60bb6d..0415a4d1f 100644 protected void eK() { this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue((double) this.fp()); diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index ce26e65aa..bb3ebf70f 100644 +index ce26e65aaf25a41663ecd8c935967c33ff3de1dc..bb3ebf70f460c459defda833d6f40026321ad638 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -39,12 +39,27 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -2037,7 +2037,7 @@ index ce26e65aa..bb3ebf70f 100644 } diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java -index 767d18d5a..cb8aee569 100644 +index 767d18d5a0417813c514d0341b318d6321f6f7a5..cb8aee5691ff4ecaa6ae60f1637b1852d3b6c162 100644 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java @@ -8,6 +8,13 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract { @@ -2055,7 +2055,7 @@ index 767d18d5a..cb8aee569 100644 protected SoundEffect getSoundAmbient() { super.getSoundAmbient(); diff --git a/src/main/java/net/minecraft/server/EntityHorseMule.java b/src/main/java/net/minecraft/server/EntityHorseMule.java -index 3dd4d4f0f..243aeb736 100644 +index 3dd4d4f0f35e2b12686e1a257250934e5678e397..243aeb736e350418e9476819bbfec0e7ab59f92f 100644 --- a/src/main/java/net/minecraft/server/EntityHorseMule.java +++ b/src/main/java/net/minecraft/server/EntityHorseMule.java @@ -8,6 +8,12 @@ public class EntityHorseMule extends EntityHorseChestedAbstract { @@ -2072,7 +2072,7 @@ index 3dd4d4f0f..243aeb736 100644 protected SoundEffect getSoundAmbient() { super.getSoundAmbient(); diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index a53d335f3..e2c6a5807 100644 +index a53d335f3af9df80bec3f94f81fb5ff0e0e5ebb5..e2c6a5807a4554a7eebb148e40f1f8a1d979df5e 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -12,6 +12,18 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -2113,7 +2113,7 @@ index a53d335f3..e2c6a5807 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java -index 0e9817360..559ba5097 100644 +index 0e98173607c810e0e74552a2ba8febf292357c39..559ba50977147b8e2a0e7c1e7dc281faabd7f292 100644 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java @@ -8,6 +8,18 @@ public class EntityHorseZombie extends EntityHorseAbstract { @@ -2143,7 +2143,7 @@ index 0e9817360..559ba5097 100644 + protected void eV() { if (world.purpurConfig.zombieHorseCanSwim) goalSelector.a(0, new PathfinderGoalFloat(this)); } // Purpur } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 75f987411..deb6c9342 100644 +index 75f98741153cf63cbb6b9abfabed0451277ba801..deb6c93426e35c47fbe23dba71bd1712f4dba652 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2148,4 +2148,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -2163,7 +2163,7 @@ index 75f987411..deb6c9342 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java -index a9dcf6875..44c006bb1 100644 +index a9dcf6875efda502d174c74bd17026a5c8f0fdcb..44c006bb10f36aff90cb07516d40a1b0d9bd24f5 100644 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java @@ -20,6 +20,16 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan @@ -2200,7 +2200,7 @@ index a9dcf6875..44c006bb1 100644 this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300)); this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300)); diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 1d5d87e61..80589799a 100644 +index 1d5d87e61946c674f61541455cf54018bfca1ecb..80589799ab08228d9e49afdf4570fa781092e5c5 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -29,7 +29,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -2321,7 +2321,7 @@ index 1d5d87e61..80589799a 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java -index bdff23688..9ee03b233 100644 +index bdff2368836dca230a6622a205d5772834afc6ee..9ee03b233b71d1b4b85a9a5e1f0ea9feb55dfe43 100644 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java @@ -22,9 +22,22 @@ public class EntityIronGolem extends EntityGolem implements IEntityAngerable { @@ -2372,7 +2372,7 @@ index bdff23688..9ee03b233 100644 float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 0fe6f90ea..ce29695c6 100644 +index 3ae8296c29f85d7713ce3186ca463939256d7cda..f730fa484b770eb41ce1fe4f7765b77866472798 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -459,7 +459,7 @@ public abstract class EntityLiving extends Entity { @@ -2428,7 +2428,7 @@ index 0fe6f90ea..ce29695c6 100644 this.damageEntity(DamageSource.DROWN, 1.0F); } diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index e61f53816..109927786 100644 +index e61f53816cbf09e775762403d97e9c591fb405a6..1099277868f92fdaf4b0ec3a982f26f20ead7369 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -18,7 +18,46 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -2504,7 +2504,7 @@ index e61f53816..109927786 100644 return i == -1 ? null : EnumColor.fromColorIndex(i); diff --git a/src/main/java/net/minecraft/server/EntityLlamaTrader.java b/src/main/java/net/minecraft/server/EntityLlamaTrader.java -index 7d30e5c23..b6aae5cde 100644 +index 7d30e5c2378a2b8c540d1a1a13ec0ae97367bb9a..b6aae5cdee1f8bb842ab8e06c47fb497576b464f 100644 --- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java +++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java @@ -11,6 +11,23 @@ public class EntityLlamaTrader extends EntityLlama { @@ -2532,7 +2532,7 @@ index 7d30e5c23..b6aae5cde 100644 protected EntityLlama fz() { return (EntityLlama) EntityTypes.TRADER_LLAMA.a(this.world); diff --git a/src/main/java/net/minecraft/server/EntityMagmaCube.java b/src/main/java/net/minecraft/server/EntityMagmaCube.java -index 874dd3982..cd28463e2 100644 +index 874dd39825b41f4e2b366446359920989961f084..cd28463e2bf944d94c121c8f8d6e37221754c168 100644 --- a/src/main/java/net/minecraft/server/EntityMagmaCube.java +++ b/src/main/java/net/minecraft/server/EntityMagmaCube.java @@ -8,6 +8,23 @@ public class EntityMagmaCube extends EntitySlime { @@ -2574,7 +2574,7 @@ index 874dd3982..cd28463e2 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index 38df17bd2..7966b34f8 100644 +index 38df17bd206c908582ece2c4105235feaf0f2227..7966b34f8d202d2260a35baa4cd594e4def89257 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -20,6 +20,18 @@ public class EntityMushroomCow extends EntityCow implements IShearable { @@ -2615,7 +2615,7 @@ index 38df17bd2..7966b34f8 100644 Pair pair = (Pair) optional.get(); diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index 7bd3fea6e..2f8275cd6 100644 +index 7bd3fea6e0e478337c7f6400a941675eebba517b..2f8275cd6b3cde0d3f949219f67ba7f0e0031dc3 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -16,6 +16,18 @@ public class EntityOcelot extends EntityAnimal { @@ -2653,7 +2653,7 @@ index 7bd3fea6e..2f8275cd6 100644 this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, false, false, EntityTurtle.bo)); } diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java -index b36cc9516..eafae5516 100644 +index b36cc95168c6e6fbf668ebe15c1fa10b54e570d3..eafae5516b9b5d51aa943796557926cf61476d2b 100644 --- a/src/main/java/net/minecraft/server/EntityPanda.java +++ b/src/main/java/net/minecraft/server/EntityPanda.java @@ -46,6 +46,27 @@ public class EntityPanda extends EntityAnimal { @@ -2789,7 +2789,7 @@ index b36cc9516..eafae5516 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java -index 0af6c9395..e402d4a77 100644 +index 0af6c9395b5d98e6bfa162f651d0e8cb89035afd..e402d4a77b57b8b12b7575a9793c30d7acfa7fb0 100644 --- a/src/main/java/net/minecraft/server/EntityParrot.java +++ b/src/main/java/net/minecraft/server/EntityParrot.java @@ -65,12 +65,58 @@ public class EntityParrot extends EntityPerchable implements EntityBird { @@ -2865,7 +2865,7 @@ index 0af6c9395..e402d4a77 100644 this.goalSelector.a(2, new PathfinderGoalSit(this)); this.goalSelector.a(2, new PathfinderGoalFollowOwner(this, 1.0D, 5.0F, 1.0F, true)); diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index bdfe073dc..f8c348004 100644 +index bdfe073dcd255a7359127f9ae3a962642be5526d..f8c3480045e86a18501db223c1b2254cf3298a42 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -25,6 +25,58 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -3036,7 +3036,7 @@ index bdfe073dc..f8c348004 100644 EntityPhantom.this.yaw += 180.0F; this.j = 0.1F; diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 7f52c3923..dade0bb29 100644 +index 7f52c39234e69b612b89993ce4503c20690064ed..dade0bb29422ebd68fae0edb74cbbf6d3ab89d64 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -19,9 +19,22 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable { @@ -3063,7 +3063,7 @@ index 7f52c3923..dade0bb29 100644 this.goalSelector.a(3, new PathfinderGoalBreed(this, 1.0D)); this.goalSelector.a(4, new PathfinderGoalTempt(this, 1.2D, RecipeItemStack.a(Items.CARROT_ON_A_STICK), false)); diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java -index 32b75f710..3327dbbf8 100644 +index 32b75f710b12efbcecec2c8d72d4d8cb725870fe..3327dbbf87d8f43cbc7cd728df2f4c6a33dae40d 100644 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java @@ -22,6 +22,16 @@ public class EntityPigZombie extends EntityZombie implements IEntityAngerable { @@ -3084,7 +3084,7 @@ index 32b75f710..3327dbbf8 100644 public boolean jockeyOnlyBaby() { return world.purpurConfig.zombifiedPiglinJockeyOnlyBaby; diff --git a/src/main/java/net/minecraft/server/EntityPiglin.java b/src/main/java/net/minecraft/server/EntityPiglin.java -index ca7f9dc54..334e0f73e 100644 +index ca7f9dc54ed2e58f521613b5d8027494bd20edd2..334e0f73e67ef2db7e680874faf0646995d9de8a 100644 --- a/src/main/java/net/minecraft/server/EntityPiglin.java +++ b/src/main/java/net/minecraft/server/EntityPiglin.java @@ -25,6 +25,18 @@ public class EntityPiglin extends EntityPiglinAbstract implements ICrossbow { @@ -3135,7 +3135,7 @@ index ca7f9dc54..334e0f73e 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPiglinBrute.java b/src/main/java/net/minecraft/server/EntityPiglinBrute.java -index 3e9a4af09..f6b170811 100644 +index 3e9a4af09d0a4af89584ce26428c38f59ff1ff11..f6b170811159544dc10b91226e4e54b349472c46 100644 --- a/src/main/java/net/minecraft/server/EntityPiglinBrute.java +++ b/src/main/java/net/minecraft/server/EntityPiglinBrute.java @@ -15,6 +15,18 @@ public class EntityPiglinBrute extends EntityPiglinAbstract { @@ -3177,7 +3177,7 @@ index 3e9a4af09..f6b170811 100644 PiglinBruteAI.b(this); PiglinBruteAI.c(this); diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java -index a3a428da9..cf7de0127 100644 +index a3a428da99574c485fcf2b8c7944e0d8354146ee..cf7de0127166f6175a6246062c8664e64959edeb 100644 --- a/src/main/java/net/minecraft/server/EntityPillager.java +++ b/src/main/java/net/minecraft/server/EntityPillager.java @@ -13,15 +13,29 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow { @@ -3211,7 +3211,7 @@ index a3a428da9..cf7de0127 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 05f9a8185..b5f6a98fe 100644 +index 05f9a8185489434d274301ba0a62213a5ea0ef3f..b5f6a98fe44c30417a3b3496dc45238c99c23ebe 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -506,6 +506,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -3231,7 +3231,7 @@ index 05f9a8185..b5f6a98fe 100644 public void playerTick() { diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java -index 99f0bd8f8..3d649843f 100644 +index 99f0bd8f82520778d469ec51745034e6ebd3238a..3d649843f565d2c8820b525c199bd2b9f9120cc7 100644 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java @@ -18,12 +18,34 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable { @@ -3306,7 +3306,7 @@ index 99f0bd8f8..3d649843f 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java -index 330ec38d0..16a4df27c 100644 +index 330ec38d09636232250d97baad0cef7a9305d614..16a4df27c557e2d4a0fd4f48317307b884c2688c 100644 --- a/src/main/java/net/minecraft/server/EntityPufferFish.java +++ b/src/main/java/net/minecraft/server/EntityPufferFish.java @@ -17,6 +17,18 @@ public class EntityPufferFish extends EntityFish { @@ -3338,7 +3338,7 @@ index 330ec38d0..16a4df27c 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index 25a9b7906..b766a27e9 100644 +index 25a9b7906be35e981566610c7d08aa8df5050d74..b766a27e98e19bffd3fe8f81f750750ae7681d02 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -20,6 +20,18 @@ public class EntityRabbit extends EntityAnimal { @@ -3503,7 +3503,7 @@ index 25a9b7906..b766a27e9 100644 this.d = flag; } diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java -index fd1ac7df6..a90214588 100644 +index fd1ac7df68a0caebe35290cdf7a9c37519342b61..a9021458814d84a3a82088f91956db73562c3b10 100644 --- a/src/main/java/net/minecraft/server/EntityRavager.java +++ b/src/main/java/net/minecraft/server/EntityRavager.java @@ -20,14 +20,37 @@ public class EntityRavager extends EntityRaider { @@ -3554,7 +3554,7 @@ index fd1ac7df6..a90214588 100644 this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(0.0D); } else { diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java -index 51ec63413..6dfcee2c9 100644 +index 51ec63413306cf9dcd685870ccbd4e5440ab2e7a..6dfcee2c9b658c2c9ee1179e412389934c066d48 100644 --- a/src/main/java/net/minecraft/server/EntitySalmon.java +++ b/src/main/java/net/minecraft/server/EntitySalmon.java @@ -6,6 +6,18 @@ public class EntitySalmon extends EntityFishSchool { @@ -3577,7 +3577,7 @@ index 51ec63413..6dfcee2c9 100644 public int eN() { return 5; diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java -index 2908e9cc4..a151d4295 100644 +index 2908e9cc47947daad19391d38da3c2a300f67fe5..a151d4295c02930687a23212647de60cce5405ca 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -56,10 +56,23 @@ public class EntitySheep extends EntityAnimal implements IShearable { @@ -3605,7 +3605,7 @@ index 2908e9cc4..a151d4295 100644 this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D)); this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.1D, RecipeItemStack.a(Items.WHEAT), false)); diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java -index 7bedaf02c..30e0e1416 100644 +index 7bedaf02c4a56067f55a5d15cb18c002df87a404..30e0e14162cce0c0d228139d4c537243a400ef13 100644 --- a/src/main/java/net/minecraft/server/EntityShulker.java +++ b/src/main/java/net/minecraft/server/EntityShulker.java @@ -29,12 +29,26 @@ public class EntityShulker extends EntityGolem implements IMonster { @@ -3645,7 +3645,7 @@ index 7bedaf02c..30e0e1416 100644 @Override public boolean a() { diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java -index 28b490cc1..ad428e090 100644 +index 28b490cc14f5881eb83acfbd6f30f9163ffe1926..ad428e090089a461283445022b33313520585ac5 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -11,13 +11,27 @@ public class EntitySilverfish extends EntityMonster { @@ -3685,7 +3685,7 @@ index 28b490cc1..ad428e090 100644 public void g() { diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java -index 7c39bec83..3f130e03b 100644 +index 7c39bec8314a3db63a90ccc9f040b82d754705e2..3f130e03bf8b235360385fd169d4886ffcfa626a 100644 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java @@ -6,6 +6,18 @@ public class EntitySkeleton extends EntitySkeletonAbstract { @@ -3708,7 +3708,7 @@ index 7c39bec83..3f130e03b 100644 protected SoundEffect getSoundAmbient() { return SoundEffects.ENTITY_SKELETON_AMBIENT; diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java -index ced89af70..4d5af1173 100644 +index ced89af70ca791bfe42c4e2d21604997a0cf3e0f..4d5af11734eef45821a106873b58061ea6aa7db7 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java @@ -28,12 +28,14 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR @@ -3727,7 +3727,7 @@ index ced89af70..4d5af1173 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true)); diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java -index f985caada..d123fb82b 100644 +index f985caada082eff6183d7bc9868b1782f9529eaf..d123fb82b635d5271bea9b238554a3011858eeae 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java @@ -8,6 +8,18 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract { @@ -3750,7 +3750,7 @@ index f985caada..d123fb82b 100644 return b(entitytypes, worldaccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || worldaccess.e(blockposition)); } diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java -index c872be77a..96cb080d9 100644 +index c872be77a6cd767520d5412b38ec4ed4fa87ac2f..96cb080d940db22330598a8806726088b79a53c1 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java @@ -9,6 +9,18 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract { @@ -3773,7 +3773,7 @@ index c872be77a..96cb080d9 100644 protected void initPathfinder() { this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityPiglinAbstract.class, true)); diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index e99fd8811..460263629 100644 +index e99fd88118a75f36cb93d02aa7c6029bcffd5f10..46026362981ce8a3a9e7d63e16230b5425a5d388 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -34,12 +34,45 @@ public class EntitySlime extends EntityInsentient implements IMonster { @@ -3889,7 +3889,7 @@ index e99fd8811..460263629 100644 } diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index 95ee716fc..e980da14c 100644 +index 95ee716fc9b79b5fcb8508118b3876c51f3f6987..e980da14cf4f34c87a88ffd2b908223808404966 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java @@ -14,12 +14,26 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt @@ -3946,7 +3946,7 @@ index 95ee716fc..e980da14c 100644 } diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java -index bf68efd52..92d741378 100644 +index bf68efd52f607ae353d6f84d4896926e16740523..92d74137877d096970bf9d1b4fc91beabb862b9d 100644 --- a/src/main/java/net/minecraft/server/EntitySpider.java +++ b/src/main/java/net/minecraft/server/EntitySpider.java @@ -11,14 +11,28 @@ public class EntitySpider extends EntityMonster { @@ -3979,7 +3979,7 @@ index bf68efd52..92d741378 100644 this.targetSelector.a(2, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityHuman.class)); this.targetSelector.a(3, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityIronGolem.class)); diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 148e4b158..70b952f10 100644 +index 148e4b158734f136832e5c17bdc69634c0f294aa..70b952f10a2af547f58069977ee135469d02f84d 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -26,17 +26,38 @@ public class EntitySquid extends EntityWaterAnimal { @@ -4079,7 +4079,7 @@ index 148e4b158..70b952f10 100644 if (i > 100) { diff --git a/src/main/java/net/minecraft/server/EntityStrider.java b/src/main/java/net/minecraft/server/EntityStrider.java -index 6d4c6a8f1..172867f50 100644 +index 6d4c6a8f1cbb3e938dcc7c594e93c71680758dab..172867f50d0dba45a296b029c8fa85f1a19a49dc 100644 --- a/src/main/java/net/minecraft/server/EntityStrider.java +++ b/src/main/java/net/minecraft/server/EntityStrider.java @@ -28,6 +28,18 @@ public class EntityStrider extends EntityAnimal implements ISteerable, ISaddleab @@ -4119,7 +4119,7 @@ index 6d4c6a8f1..172867f50 100644 if (flag && !this.isSilent()) { this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_STRIDER_EAT, this.getSoundCategory(), 1.0F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F); diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java -index 9e008d56b..8f227678d 100644 +index 9e008d56bb88550f399008095734436a5ab768c7..8f227678dc4ab1b7369a0c76173b3f695a570620 100644 --- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java +++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java @@ -130,6 +130,7 @@ public abstract class EntityTameableAnimal extends EntityAnimal { @@ -4131,7 +4131,7 @@ index 9e008d56b..8f227678d 100644 return entityliving == this.getOwner(); } diff --git a/src/main/java/net/minecraft/server/EntityTropicalFish.java b/src/main/java/net/minecraft/server/EntityTropicalFish.java -index 495c28ccb..2c9df356e 100644 +index 495c28ccb86a5645459c9265c90dfffb6972d604..2c9df356e685ea6f71653023fadcf7e287dcd46e 100644 --- a/src/main/java/net/minecraft/server/EntityTropicalFish.java +++ b/src/main/java/net/minecraft/server/EntityTropicalFish.java @@ -19,6 +19,18 @@ public class EntityTropicalFish extends EntityFishSchool { @@ -4154,7 +4154,7 @@ index 495c28ccb..2c9df356e 100644 protected void initDatawatcher() { super.initDatawatcher(); diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index 4ad393bc9..2b34e6cf3 100644 +index 4ad393bc99881d813e2b349fb929fc8e69631723..2b34e6cf3b86319bd2875d92b63902889fec32a8 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -27,6 +27,18 @@ public class EntityTurtle extends EntityAnimal { @@ -4236,7 +4236,7 @@ index 4ad393bc9..2b34e6cf3 100644 if (this.h == ControllerMove.Operation.MOVE_TO && !this.i.getNavigation().m()) { double d0 = this.b - this.i.locX(); diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index ed6a47ad2..ac75ed3e2 100644 +index ed6a47ad2fd973695fbb151d1a44000ec3639e54..ac75ed3e2e0e0cd8f91de9ff188e173591443b72 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -19,6 +19,45 @@ public class EntityVex extends EntityMonster { @@ -4333,7 +4333,7 @@ index ed6a47ad2..ac75ed3e2 100644 Vec3D vec3d = new Vec3D(this.b - EntityVex.this.locX(), this.c - EntityVex.this.locY(), this.d - EntityVex.this.locZ()); double d0 = vec3d.f(); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 5d37cb14f..166a8f9a7 100644 +index 5d37cb14f9cb7e3a1491a3dbcf2129268572aa28..166a8f9a7fe9320f54276445fbfb04059ce18b8c 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -75,8 +75,19 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -4377,7 +4377,7 @@ index 5d37cb14f..166a8f9a7 100644 this.h(entityhuman); } diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java -index 96dda6a14..3ea66955d 100644 +index 96dda6a14fd17509e9bcb72cc7e9c8532c6a036b..3ea66955df304fd13aac2cf9bb93ea156558ae57 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java @@ -23,6 +23,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract { @@ -4417,7 +4417,7 @@ index 96dda6a14..3ea66955d 100644 this.setTradingPlayer(entityhuman); this.openTrade(entityhuman, this.getScoreboardDisplayName(), 1); diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index 8f812aa91..9950bda50 100644 +index 8f812aa9133e29d1450ab210fec68b23ca4d3042..9950bda50f405ce44f8fc8d95682e2522cf9e10f 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -17,14 +17,28 @@ public class EntityVindicator extends EntityIllagerAbstract { @@ -4450,7 +4450,7 @@ index 8f812aa91..9950bda50 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true)); diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index ca3c5150b..323d79a99 100644 +index ca3c5150bcfe2a92b49ad5a27c23dd37a7054fbb..323d79a99402b0f6952b4fb873170069f3428953 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -24,6 +24,18 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -4486,7 +4486,7 @@ index ca3c5150b..323d79a99 100644 this.targetSelector.a(2, this.br); this.targetSelector.a(3, this.bs); diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 53482a420..f68cf834a 100644 +index 53482a420c356fd50e5ab6dd729a271d6594dac7..f68cf834aa65cc4bbb1eb9901586395d41770955 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -32,6 +32,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -4694,7 +4694,7 @@ index 53482a420..f68cf834a 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index dcbb34313..9ae716859 100644 +index dcbb34313fedb21e180a0b76610a787e6419d404..9ae7168595dd66860e09ef87f946b18b010e54b1 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -33,9 +33,27 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable @@ -4734,7 +4734,7 @@ index dcbb34313..9ae716859 100644 this.targetSelector.a(2, new PathfinderGoalOwnerHurtTarget(this)); this.targetSelector.a(3, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(new Class[0])); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/EntityZoglin.java b/src/main/java/net/minecraft/server/EntityZoglin.java -index e76e6ebde..d92fe8013 100644 +index e76e6ebde73b93dc06e76b71cdf6371c3654160a..d92fe8013fb3b43cb7eabdf1c624291b7e881889 100644 --- a/src/main/java/net/minecraft/server/EntityZoglin.java +++ b/src/main/java/net/minecraft/server/EntityZoglin.java @@ -21,6 +21,18 @@ public class EntityZoglin extends EntityMonster implements IMonster, IOglin { @@ -4798,7 +4798,7 @@ index e76e6ebde..d92fe8013 100644 this.eL(); } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index b90ea3144..e2f68d843 100644 +index b90ea31440fe49124bd2fb003884768ce8a1e528..e2f68d843c8eff2c6bcb7d2535af771a51be150e 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -46,6 +46,16 @@ public class EntityZombie extends EntityMonster { @@ -4831,7 +4831,7 @@ index b90ea3144..e2f68d843 100644 } diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java -index ce6d79780..02b0ae550 100644 +index ce6d79780197eb9300130036a8ed84648a17f9cf..02b0ae550a0ed33b5b43beedf3b1405985c58c13 100644 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java @@ -9,6 +9,16 @@ public class EntityZombieHusk extends EntityZombie { @@ -4852,7 +4852,7 @@ index ce6d79780..02b0ae550 100644 public boolean jockeyOnlyBaby() { return world.purpurConfig.huskJockeyOnlyBaby; diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 505c83f3e..0c47477b4 100644 +index 505c83f3e3ad61c2d4d40c4df017e1f7a9a3ad8c..0c47477b416980d2e932321730525bf5a8feda4f 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -29,6 +29,16 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo @@ -4873,7 +4873,7 @@ index 505c83f3e..0c47477b4 100644 public boolean jockeyOnlyBaby() { return world.purpurConfig.zombieVillagerJockeyOnlyBaby; diff --git a/src/main/java/net/minecraft/server/GeneratorAccess.java b/src/main/java/net/minecraft/server/GeneratorAccess.java -index cbc0b8bc8..89d64ea0d 100644 +index cbc0b8bc854ab1b0ba95fa0a2041385f440718d9..89d64ea0d1e61dfce622df026209af129efd5773 100644 --- a/src/main/java/net/minecraft/server/GeneratorAccess.java +++ b/src/main/java/net/minecraft/server/GeneratorAccess.java @@ -37,6 +37,7 @@ public interface GeneratorAccess extends ICombinedAccess, IWorldTime { @@ -4885,7 +4885,7 @@ index cbc0b8bc8..89d64ea0d 100644 default int getHeight() { diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java -index 9f5ce64a6..b9f8ed355 100644 +index 9f5ce64a60fe7c312399ee416b11b84213dd3bee..b9f8ed355421f24306e0cc2bb976589f4b72b548 100644 --- a/src/main/java/net/minecraft/server/IProjectile.java +++ b/src/main/java/net/minecraft/server/IProjectile.java @@ -12,7 +12,7 @@ public abstract class IProjectile extends Entity { @@ -4915,7 +4915,7 @@ index 9f5ce64a6..b9f8ed355 100644 Entity entity1 = this.getShooter(); // Paper start - Cancel hit for vanished players diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c339c57b0..fd75444ce 100644 +index dd1e083289b875f1b87ae2aa6179c7babaf79ad5..2374a7ee018493795389b21848289395168db422 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1411,6 +1411,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHasRider.java b/src/main/java/net/minecraft/server/PathfinderGoalHasRider.java new file mode 100644 -index 000000000..da18e1235 +index 0000000000000000000000000000000000000000..da18e1235eed1988052fbd761c11f77efd7afc5e --- /dev/null +++ b/src/main/java/net/minecraft/server/PathfinderGoalHasRider.java @@ -0,0 +1,18 @@ @@ -4952,7 +4952,7 @@ index 000000000..da18e1235 +} diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseHasRider.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseHasRider.java new file mode 100644 -index 000000000..44929182d +index 0000000000000000000000000000000000000000..44929182dfd7ad847d9657c324f440cbf29abadf --- /dev/null +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseHasRider.java @@ -0,0 +1,16 @@ @@ -4973,7 +4973,7 @@ index 000000000..44929182d + } +} diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 261dbea12..f4f4127b0 100644 +index 261dbea122b092afb413e034f2cefec8002941c7..f4f4127b017215ff26b406ff22db8da77c9cbf92 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2231,6 +2231,8 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -4986,7 +4986,7 @@ index 261dbea12..f4f4127b0 100644 if ((entity instanceof EntityFish && origItem != null && origItem.getItem() == Items.WATER_BUCKET) && (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem)) { this.sendPacket(new PacketPlayOutSpawnEntityLiving((EntityFish) entity)); diff --git a/src/main/java/net/minecraft/server/ProjectileHelper.java b/src/main/java/net/minecraft/server/ProjectileHelper.java -index b2c64b314..515ba50ae 100644 +index b2c64b31440389db5abe2322f7e31b328f590f6c..515ba50aec81497d27297e4b6c642e86b7de53ca 100644 --- a/src/main/java/net/minecraft/server/ProjectileHelper.java +++ b/src/main/java/net/minecraft/server/ProjectileHelper.java @@ -7,6 +7,7 @@ import javax.annotation.Nullable; @@ -4998,7 +4998,7 @@ index b2c64b314..515ba50ae 100644 Vec3D vec3d = entity.getMot(); World world = entity.world; diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java -index 5af554870..c59305ef7 100644 +index 5af554870bcf36e47aef43b966b141b9eda6c4d5..c59305ef7dd7847e204d4c4ed79758bf9d66e91e 100644 --- a/src/main/java/net/minecraft/server/Vec3D.java +++ b/src/main/java/net/minecraft/server/Vec3D.java @@ -39,6 +39,7 @@ public class Vec3D implements IPosition { @@ -5026,7 +5026,7 @@ index 5af554870..c59305ef7 100644 return new Vec3D(this.x * d0, this.y * d1, this.z * d2); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7a82a894b..bdfdb73bc 100644 +index 7a82a894bb3f737cc80f0b4b8d7a1b25ce1afc6c..bdfdb73bc1305d3fbda2e0ebe8163bf43b8aede5 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1648,5 +1648,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -5041,7 +5041,7 @@ index 7a82a894b..bdfdb73bc 100644 // Purpur end } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 66883ea89..bc35bfd96 100644 +index 9d93a8c86b675cf55210724a0b695f960b009d69..bed00077205d3c2d7b2eb67db5af86ddc5346cc2 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -102,6 +102,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -5053,7 +5053,7 @@ index 66883ea89..bc35bfd96 100644 return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index f75df9990..6e22d0cd0 100644 +index f75df999005e4d2bab4df82531a37fc914d84175..6e22d0cd05cc5f0d8d66b03b6484859aad0a387c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -134,11 +134,13 @@ public class PurpurConfig { @@ -5071,7 +5071,7 @@ index f75df9990..6e22d0cd0 100644 public static int dungeonSeed = -1; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5cc717c8d..a222cd43a 100644 +index 5cc717c8d3829a1503fd53ae06f433a6e8f14894..a222cd43afb5668c71e88f001e89da0f277be43e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -42,11 +42,6 @@ public class PurpurWorldConfig { @@ -5723,7 +5723,7 @@ index 5cc717c8d..a222cd43a 100644 zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens); diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java new file mode 100644 -index 000000000..0b16a7b63 +index 0000000000000000000000000000000000000000..0b16a7b6345ff42ea0f42ca79155a50e2fe4926b --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java @@ -0,0 +1,76 @@ @@ -5805,7 +5805,7 @@ index 000000000..0b16a7b63 +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java new file mode 100644 -index 000000000..426688b3a +index 0000000000000000000000000000000000000000..426688b3a6dc197b41ddc4d1efed0405614f0f3b --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java @@ -0,0 +1,92 @@ @@ -5903,7 +5903,7 @@ index 000000000..426688b3a +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java new file mode 100644 -index 000000000..33c51460a +index 0000000000000000000000000000000000000000..33c51460ab9556e5574c99232e9e3ff843c6ccc9 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java @@ -0,0 +1,61 @@ @@ -5970,7 +5970,7 @@ index 000000000..33c51460a +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java new file mode 100644 -index 000000000..f75375936 +index 0000000000000000000000000000000000000000..f7537593619a68eb3898f28034192fab8548655c --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java @@ -0,0 +1,61 @@ @@ -6037,7 +6037,7 @@ index 000000000..f75375936 +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java new file mode 100644 -index 000000000..1b08a0905 +index 0000000000000000000000000000000000000000..1b08a0905b296b989e0ef0ea3b15169759b5f2fe --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java @@ -0,0 +1,50 @@ @@ -6093,7 +6093,7 @@ index 000000000..1b08a0905 +} diff --git a/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java new file mode 100644 -index 000000000..a01524c6a +index 0000000000000000000000000000000000000000..a01524c6abaec13d7249d7aba6da9e4bc39f8b99 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java @@ -0,0 +1,120 @@ @@ -6219,7 +6219,7 @@ index 000000000..a01524c6a +} diff --git a/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java new file mode 100644 -index 000000000..929e4ff91 +index 0000000000000000000000000000000000000000..929e4ff91c79e2ee72970d754bae270377ac9314 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java @@ -0,0 +1,125 @@ @@ -6349,7 +6349,7 @@ index 000000000..929e4ff91 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 1fe253bc7..bf387664c 100644 +index 1fe253bc7261a6077747addf8d9023ca94525999..bf387664c2f509ff047b2cbaa3d6619a0718f5e9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1159,4 +1159,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -6380,7 +6380,7 @@ index 1fe253bc7..bf387664c 100644 + // Purpur end } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 71306b6ee..a17f449b5 100644 +index 71306b6ee6456ae6d4120fda86eb934bdb494973..a17f449b543d2ab4191b6397835856e1a7d664e3 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -502,6 +502,18 @@ public class CraftEventFactory { diff --git a/patches/server/0113-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0113-Use-configured-height-for-nether-surface-builders.patch index 3557fecd5..f33db91a8 100644 --- a/patches/server/0113-Use-configured-height-for-nether-surface-builders.patch +++ b/patches/server/0113-Use-configured-height-for-nether-surface-builders.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From e43e5cef085a99d5cc4d163f038bd362f7091a4c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 15 Aug 2020 06:51:46 -0500 Subject: [PATCH] Use configured height for nether surface builders diff --git a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java -index 462f0b2ba..f418a71ca 100644 +index 462f0b2baea4207d7d82f2d4e043a5a7999a1f42..f418a71ca8ec5e1417778d33c9020dc002a611cc 100644 --- a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java +++ b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java @@ -35,7 +35,7 @@ public abstract class WorldGenSurfaceNetherAbstract extends WorldGenSurface Date: Mon, 17 Aug 2020 17:34:33 -0500 Subject: [PATCH] Crying obsidian valid for portal frames diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 1fc98698b..d621b11ba 100644 +index 1fc98698b81c079ebe4a524200232db1fe143bdf..d621b11ba9029a732a819e0558d6f8a439990dbe 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -100,6 +100,7 @@ public class Block extends BlockBase implements IMaterial { @@ -17,7 +17,7 @@ index 1fc98698b..d621b11ba 100644 return this == block; } diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java -index 483756316..5550693a4 100644 +index 483756316a51780da2122b68e73ffc5fc9d87df3..5550693a4ea0c1d99abb35b826d09963bc6c45fd 100644 --- a/src/main/java/net/minecraft/server/BlockBase.java +++ b/src/main/java/net/minecraft/server/BlockBase.java @@ -725,6 +725,7 @@ public abstract class BlockBase { @@ -29,7 +29,7 @@ index 483756316..5550693a4 100644 return this.getBlock().a(block); } diff --git a/src/main/java/net/minecraft/server/BlockPortalShape.java b/src/main/java/net/minecraft/server/BlockPortalShape.java -index 6ef81aeb4..9ea3c30b6 100644 +index 6ef81aeb4c63bc6c23163796dbd977602ca2f540..9ea3c30b679da4e77b86d96d0cc476732040f184 100644 --- a/src/main/java/net/minecraft/server/BlockPortalShape.java +++ b/src/main/java/net/minecraft/server/BlockPortalShape.java @@ -14,7 +14,7 @@ import org.bukkit.event.world.PortalCreateEvent; @@ -42,7 +42,7 @@ index 6ef81aeb4..9ea3c30b6 100644 private final GeneratorAccess b; private final EnumDirection.EnumAxis c; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 6e22d0cd0..b71d3187e 100644 +index 6e22d0cd05cc5f0d8d66b03b6484859aad0a387c..b71d3187e81241834827dc36352d87b0397d62b4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -176,6 +176,7 @@ public class PurpurConfig { diff --git a/patches/server/0115-Entities-can-use-portals-configuration.patch b/patches/server/0115-Entities-can-use-portals-configuration.patch index b49b2d55a..72655830e 100644 --- a/patches/server/0115-Entities-can-use-portals-configuration.patch +++ b/patches/server/0115-Entities-can-use-portals-configuration.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From e800bf2feb7abda0737fca4cd274c852266d3833 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 17 Aug 2020 19:32:05 -0500 Subject: [PATCH] Entities can use portals configuration diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7e379aa14..13227c558 100644 +index 3eef1534c0dc3c6089f0d619d42784775fb1626e..28c502b5721bd150d9b9d2d84cb07c55af8373f1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2411,7 +2411,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -27,7 +27,7 @@ index 7e379aa14..13227c558 100644 public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a222cd43a..1025b5dae 100644 +index a222cd43afb5668c71e88f001e89da0f277be43e..1025b5daef29da23f1a80c1c0a1ef0eeee18384e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -140,6 +140,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0116-LivingEntity-broadcastItemBreak.patch b/patches/server/0116-LivingEntity-broadcastItemBreak.patch index bfdd21522..105739d11 100644 --- a/patches/server/0116-LivingEntity-broadcastItemBreak.patch +++ b/patches/server/0116-LivingEntity-broadcastItemBreak.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From fde876e86b3d63ce9fba041f42e4a8069697cea6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 17 Aug 2020 21:50:39 -0500 Subject: [PATCH] LivingEntity#broadcastItemBreak diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 664472312..62bdc1abe 100644 +index 66447231244dbe3d6fadaa0d00710f9ec7f72445..62bdc1abe3355d1c730bcacab29b72d89f843b97 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -827,5 +827,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0117-Customizable-wither-health-and-healing.patch b/patches/server/0117-Customizable-wither-health-and-healing.patch index 7395c050a..4215c55c2 100644 --- a/patches/server/0117-Customizable-wither-health-and-healing.patch +++ b/patches/server/0117-Customizable-wither-health-and-healing.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f57bdbd2173d0c747d41b55a6b19c89e8e63826c Mon Sep 17 00:00:00 2001 From: jmp Date: Thu, 20 Aug 2020 17:38:12 -0700 Subject: [PATCH] Customizable wither health and healing @@ -6,7 +6,7 @@ Subject: [PATCH] Customizable wither health and healing Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often. diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index f68cf834a..e8cc3af60 100644 +index f68cf834aa65cc4bbb1eb9901586395d41770955..e8cc3af606f4874b6f32369f7f211f480670868b 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -145,6 +145,13 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -54,7 +54,7 @@ index f68cf834a..e8cc3af60 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1025b5dae..0f2e0e779 100644 +index 1025b5daef29da23f1a80c1c0a1ef0eeee18384e..0f2e0e779198765a7dfa2d4c56b8b2ff8fb08f96 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -910,10 +910,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0118-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0118-Allow-toggling-special-MobSpawners-per-world.patch index a09d681d2..01af4823b 100644 --- a/patches/server/0118-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0118-Allow-toggling-special-MobSpawners-per-world.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7e8c34008c978cbdc93f3988e32c2deda0e4eb9b Mon Sep 17 00:00:00 2001 From: jmp Date: Sat, 22 Aug 2020 20:47:11 -0700 Subject: [PATCH] Allow toggling special MobSpawners per world @@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this. diff --git a/src/main/java/net/minecraft/server/MobSpawnerTrader.java b/src/main/java/net/minecraft/server/MobSpawnerTrader.java -index 8d89f5118..072ec40f7 100644 +index 8d89f51182444852062d549d23c00a93e601eb38..072ec40f751b19c2a78dfcc6e439c64358d864d3 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerTrader.java +++ b/src/main/java/net/minecraft/server/MobSpawnerTrader.java @@ -132,7 +132,17 @@ public class MobSpawnerTrader implements MobSpawner { @@ -29,7 +29,7 @@ index 8d89f5118..072ec40f7 100644 if (SpawnerCreature.a(EntityPositionTypes.Surface.ON_GROUND, iworldreader, blockposition2, EntityTypes.WANDERING_TRADER)) { blockposition1 = blockposition2; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bdfdb73bc..ab97d076c 100644 +index bdfdb73bc1305d3fbda2e0ebe8163bf43b8aede5..ab97d076c921e1fd3ba69ed4b93d43e930d54bfc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -156,7 +156,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -42,7 +42,7 @@ index bdfdb73bc..ab97d076c 100644 this.generator = gen; this.world = new CraftWorld((WorldServer) this, gen, env); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index bc35bfd96..644ff6879 100644 +index bed00077205d3c2d7b2eb67db5af86ddc5346cc2..a1069b64b3af02cbd5d2808275c09d7680c7c1c6 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -332,7 +332,24 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -72,7 +72,7 @@ index bc35bfd96..644ff6879 100644 this.worldDataServer = (WorldDataServer) iworlddataserver; worldDataServer.world = this; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0f2e0e779..92a1fb69e 100644 +index 0f2e0e779198765a7dfa2d4c56b8b2ff8fb08f96..92a1fb69e58237780fe03afcd5fc2ed16657345b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -7,6 +7,8 @@ import net.minecraft.server.IRegistry; diff --git a/patches/server/0119-Raid-cooldown-setting.patch b/patches/server/0119-Raid-cooldown-setting.patch index 6ce0418cb..4b8c74722 100644 --- a/patches/server/0119-Raid-cooldown-setting.patch +++ b/patches/server/0119-Raid-cooldown-setting.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 035505df1475231560da1c23d575bd7d121ffd7b Mon Sep 17 00:00:00 2001 From: jmp Date: Thu, 27 Aug 2020 13:48:52 -0700 Subject: [PATCH] Raid cooldown setting diff --git a/src/main/java/net/minecraft/server/PersistentRaid.java b/src/main/java/net/minecraft/server/PersistentRaid.java -index 826dcf9f7..807910c60 100644 +index 826dcf9f7eedc3664d66170b97b2a19552a0dc60..807910c60e6cad58b91474b0477e6fc109eaf281 100644 --- a/src/main/java/net/minecraft/server/PersistentRaid.java +++ b/src/main/java/net/minecraft/server/PersistentRaid.java @@ -9,6 +9,7 @@ import javax.annotation.Nullable; @@ -52,7 +52,7 @@ index 826dcf9f7..807910c60 100644 if (!this.raids.containsKey(raid.getId())) { this.raids.put(raid.getId(), raid); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 92a1fb69e..19e43dd63 100644 +index 92a1fb69e58237780fe03afcd5fc2ed16657345b..19e43dd63cd3001b927eb5857002231073bc03a2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -155,6 +155,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0120-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0120-Despawn-rate-config-options-per-projectile-type.patch index a1218fe66..b56af2666 100644 --- a/patches/server/0120-Despawn-rate-config-options-per-projectile-type.patch +++ b/patches/server/0120-Despawn-rate-config-options-per-projectile-type.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 9f97b1c2ab8e798c407cf2b2ef43797ec1496a91 Mon Sep 17 00:00:00 2001 From: jmp Date: Mon, 14 Sep 2020 10:09:05 -0700 Subject: [PATCH] Despawn rate config options per projectile type @@ -6,7 +6,7 @@ Subject: [PATCH] Despawn rate config options per projectile type Default values of -1 respect vanilla behaviour. diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 1e7f5957d..7f89b269e 100644 +index 1e7f5957d879d1ba8cf2b29cf9397b8e204e4381..7f89b269e37e1046a64c62e1db2a37e6aa4cd54c 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -23,7 +23,7 @@ public abstract class EntityArrow extends IProjectile { @@ -48,7 +48,7 @@ index 1e7f5957d..7f89b269e 100644 private void A() { diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java -index 27032abad..9d2d5be5e 100644 +index 27032abad4f3da1d1b28a3cec49e3fc079deadb9..9d2d5be5eedc60749e276434be9be6ab41f2289d 100644 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java @@ -75,4 +75,11 @@ public class EntityDragonFireball extends EntityFireball { @@ -64,7 +64,7 @@ index 27032abad..9d2d5be5e 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java -index edce89169..4951abdfa 100644 +index edce89169b3ca2894852087b83a6bf035ba43c3f..4951abdfa13d170b7075a0223dd0096d77dec6ea 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java @@ -87,4 +87,11 @@ public class EntityEgg extends EntityProjectileThrowable { @@ -80,7 +80,7 @@ index edce89169..4951abdfa 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java -index 63b4a449b..e8650c1bf 100644 +index 63b4a449b56ef549830e4bbd3eab116e64379189..e8650c1bfa8f94ba461b7094125679112d825980 100644 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java @@ -106,4 +106,11 @@ public class EntityEnderPearl extends EntityProjectileThrowable { @@ -96,7 +96,7 @@ index 63b4a449b..e8650c1bf 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index a646dc9f0..9789d480a 100644 +index a646dc9f030ad1f76ba2b7bb1bc7897cd34b648c..9789d480ad2b6da6874004c068a298ed9c69a4e3 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -298,4 +298,11 @@ public class EntityFireworks extends IProjectile { @@ -112,7 +112,7 @@ index a646dc9f0..9789d480a 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 519df0002..6891e61bc 100644 +index 519df0002be34da47ea967e5c0d2cf828c166df8..6891e61bcfea82958e100abaef94865bf36a32c2 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -576,4 +576,11 @@ public class EntityFishingHook extends IProjectile { @@ -128,7 +128,7 @@ index 519df0002..6891e61bc 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityLargeFireball.java b/src/main/java/net/minecraft/server/EntityLargeFireball.java -index b4b0dfbc7..d12de20cf 100644 +index b4b0dfbc70f91f74f9792b835ec2f8d5af41c311..d12de20cf4bb2345c616d3cc0b9f50bddb5135ee 100644 --- a/src/main/java/net/minecraft/server/EntityLargeFireball.java +++ b/src/main/java/net/minecraft/server/EntityLargeFireball.java @@ -66,4 +66,11 @@ public class EntityLargeFireball extends EntityFireballFireball { @@ -144,7 +144,7 @@ index b4b0dfbc7..d12de20cf 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityLlamaSpit.java b/src/main/java/net/minecraft/server/EntityLlamaSpit.java -index 7636a51a7..3e6438c97 100644 +index 7636a51a7ef0aa05b5b2aaa9d17e7b551dedac96..3e6438c9778ec6c9f62ac74d97fb5108944d0952 100644 --- a/src/main/java/net/minecraft/server/EntityLlamaSpit.java +++ b/src/main/java/net/minecraft/server/EntityLlamaSpit.java @@ -71,4 +71,11 @@ public class EntityLlamaSpit extends IProjectile { @@ -160,7 +160,7 @@ index 7636a51a7..3e6438c97 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java -index d57da221c..6d4b1e58d 100644 +index d57da221c103ceb7e635dfbaf4cedff1cd9612ed..6d4b1e58dfd6c9654e5ab91fffcda82994d3714e 100644 --- a/src/main/java/net/minecraft/server/EntityPotion.java +++ b/src/main/java/net/minecraft/server/EntityPotion.java @@ -240,4 +240,11 @@ public class EntityPotion extends EntityProjectileThrowable { @@ -176,7 +176,7 @@ index d57da221c..6d4b1e58d 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityShulkerBullet.java b/src/main/java/net/minecraft/server/EntityShulkerBullet.java -index 23017b548..0b16473ae 100644 +index 23017b5486530bcf76b3934cfa8621e8b4772b27..0b16473aedfca996d1f6767bead4a2191df1df9e 100644 --- a/src/main/java/net/minecraft/server/EntityShulkerBullet.java +++ b/src/main/java/net/minecraft/server/EntityShulkerBullet.java @@ -313,4 +313,11 @@ public class EntityShulkerBullet extends IProjectile { @@ -192,7 +192,7 @@ index 23017b548..0b16473ae 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntitySmallFireball.java b/src/main/java/net/minecraft/server/EntitySmallFireball.java -index 350e92ac9..4ed7a20bf 100644 +index 350e92ac99fe48ba046a51e1db4b977dd9bfc20a..4ed7a20bfed267776628457a4b33178bac7d1972 100644 --- a/src/main/java/net/minecraft/server/EntitySmallFireball.java +++ b/src/main/java/net/minecraft/server/EntitySmallFireball.java @@ -86,4 +86,11 @@ public class EntitySmallFireball extends EntityFireballFireball { @@ -208,7 +208,7 @@ index 350e92ac9..4ed7a20bf 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntitySnowball.java b/src/main/java/net/minecraft/server/EntitySnowball.java -index e44249f59..34a5f481e 100644 +index e44249f59b742d16f08643ee2a83fdcd0bed9590..34a5f481e6ed1357861dca15fb4013ec8484a292 100644 --- a/src/main/java/net/minecraft/server/EntitySnowball.java +++ b/src/main/java/net/minecraft/server/EntitySnowball.java @@ -14,6 +14,12 @@ public class EntitySnowball extends EntityProjectileThrowable { @@ -225,7 +225,7 @@ index e44249f59..34a5f481e 100644 protected Item getDefaultItem() { return Items.SNOWBALL; diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java -index 2d3ca8c42..1d32518bd 100644 +index 2d3ca8c424f2088027d51066d634c48723e96214..1d32518bd7982f20574d56f2f2ea4142ea1e015d 100644 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java @@ -51,4 +51,11 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable { @@ -241,7 +241,7 @@ index 2d3ca8c42..1d32518bd 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityWitherSkull.java b/src/main/java/net/minecraft/server/EntityWitherSkull.java -index 2c02e114c..4a97a7517 100644 +index 2c02e114cce1f49b643e75e7ab3c05be716d7dba..4a97a7517dc1a2a25c578d9e168240cc19ab0831 100644 --- a/src/main/java/net/minecraft/server/EntityWitherSkull.java +++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java @@ -116,4 +116,11 @@ public class EntityWitherSkull extends EntityFireball { @@ -257,7 +257,7 @@ index 2c02e114c..4a97a7517 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java -index b9f8ed355..58f03f1d2 100644 +index b9f8ed355421f24306e0cc2bb976589f4b72b548..58f03f1d2e2f9e4c072c727ae202a9e37628b81f 100644 --- a/src/main/java/net/minecraft/server/IProjectile.java +++ b/src/main/java/net/minecraft/server/IProjectile.java @@ -13,11 +13,25 @@ public abstract class IProjectile extends Entity { @@ -300,7 +300,7 @@ index b9f8ed355..58f03f1d2 100644 public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 19e43dd63..7dcc0211b 100644 +index 19e43dd63cd3001b927eb5857002231073bc03a2..7dcc0211b0e5ab359b2cabfeee0f3f442835b5e1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -147,6 +147,35 @@ public class PurpurWorldConfig { diff --git a/patches/server/0121-PaperPR-Add-hex-color-code-support-for-console-loggi.patch b/patches/server/0121-PaperPR-Add-hex-color-code-support-for-console-loggi.patch index 54bea50d3..689595fdf 100644 --- a/patches/server/0121-PaperPR-Add-hex-color-code-support-for-console-loggi.patch +++ b/patches/server/0121-PaperPR-Add-hex-color-code-support-for-console-loggi.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a11b31a13a45d69f00be7b2ba4b00663705572b0 Mon Sep 17 00:00:00 2001 From: Esophose Date: Thu, 27 Aug 2020 12:25:18 -0500 Subject: [PATCH] PaperPR - Add hex color code support for console logging diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java -index 685deaa0e..2a0ada490 100644 +index 685deaa0e5d1ddc13e3a7c0471b1cfcf1710c869..2a0ada490b15b0c4939dd4304f86e01634fb1cfa 100644 --- a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java @@ -1,17 +1,52 @@ @@ -63,7 +63,7 @@ index 685deaa0e..2a0ada490 100644 + } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index b71d3187e..bcb9857b7 100644 +index b71d3187e81241834827dc36352d87b0397d62b4..bcb9857b739e81714bc4b5ef378ae7aca640f866 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -221,9 +221,11 @@ public class PurpurConfig { diff --git a/patches/server/0122-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0122-Add-option-to-disable-zombie-aggressiveness-towards-.patch index d63047d62..4c9e6be5e 100644 --- a/patches/server/0122-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/server/0122-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 87e539fc4208c6cbd71f24de6e865597a9257ea0 Mon Sep 17 00:00:00 2001 From: nitricspace Date: Mon, 21 Sep 2020 23:19:43 +0100 Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -index 89b56de75..ded483ace 100644 +index 89b56de7567ae54be75e0735b712e4dd713f1bf4..ded483ace0e93b695a5078391582c1654b6d139a 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java @@ -131,6 +131,10 @@ public class MobGoalHelper { @@ -21,7 +21,7 @@ index 89b56de75..ded483ace 100644 ignored.add("selector_1"); ignored.add("selector_2"); diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 125eab60f..638efc67d 100644 +index 125eab60f2b4657e52a71eddf7586c574945252e..638efc67d66001ee085957d4698f51a7daac77fc 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -58,7 +58,18 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -45,7 +45,7 @@ index 125eab60f..638efc67d 100644 this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo)); } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index e2f68d843..3ad8bd084 100644 +index e2f68d843c8eff2c6bcb7d2535af771a51be150e..3ad8bd0847aacabf90e83c00cd7c1a8f51aaa2e4 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -85,7 +85,18 @@ public class EntityZombie extends EntityMonster { @@ -69,7 +69,7 @@ index e2f68d843..3ad8bd084 100644 this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo)); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7dcc0211b..f04e2e562 100644 +index 7dcc0211b0e5ab359b2cabfeee0f3f442835b5e1..f04e2e562fb07ca0f1b4ac4e25fdb050554b5431 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1012,12 +1012,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0123-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0123-Persistent-TileEntity-Lore-and-DisplayName.patch index 6f72047e8..7406e3fc8 100644 --- a/patches/server/0123-Persistent-TileEntity-Lore-and-DisplayName.patch +++ b/patches/server/0123-Persistent-TileEntity-Lore-and-DisplayName.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7f873f7c3df6734b6ee43eb3b0514545b4f88de0 Mon Sep 17 00:00:00 2001 From: jmp Date: Wed, 30 Sep 2020 14:32:46 -0700 Subject: [PATCH] Persistent TileEntity Lore and DisplayName @@ -7,7 +7,7 @@ Makes it so that when a TileEntity is placed in the world and then broken, the dropped ItemStack retains any original custom display name/lore. diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index d621b11ba..c276a2896 100644 +index d621b11ba9029a732a819e0558d6f8a439990dbe..c276a2896ba73d86e7e18d656903b36d2970ac41 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -207,7 +207,7 @@ public class Block extends BlockBase implements IMaterial { @@ -79,7 +79,7 @@ index d621b11ba..c276a2896 100644 if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) { float f = 0.5F; diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java -index bbb1de7d1..d97efe3d4 100644 +index bbb1de7d1adce6e986467db234b27518df4dd87f..d97efe3d4765dcae50afae49d252e710c056337f 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -96,7 +96,24 @@ public class ItemBlock extends Item { @@ -109,7 +109,7 @@ index bbb1de7d1..d97efe3d4 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 58d958a88..8e8749095 100644 +index 58d958a88ac5af5b889d719d9f1ea90ce45cf184..8e8749095427b44e04582593114cae8cf6d00f42 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -90,9 +90,25 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -165,7 +165,7 @@ index 58d958a88..8e8749095 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f04e2e562..4d97a2323 100644 +index f04e2e562fb07ca0f1b4ac4e25fdb050554b5431..4d97a232351a2a70f8992ff1d8d93b1fb976029a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -182,6 +182,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0124-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0124-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch index 2c7550330..046ab4767 100644 --- a/patches/server/0124-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch +++ b/patches/server/0124-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a82f98c73e8cbf1702f7a272760792363f86db51 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 3 Oct 2020 17:40:52 -0500 Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient diff --git a/src/main/java/net/minecraft/server/RecipeItemStack.java b/src/main/java/net/minecraft/server/RecipeItemStack.java -index 0f96abd0c..f6d929494 100644 +index 0f96abd0ca78e9c78306fed69684dee71be37703..f6d92949409b66d5d0c578e010aebd058903c6fa 100644 --- a/src/main/java/net/minecraft/server/RecipeItemStack.java +++ b/src/main/java/net/minecraft/server/RecipeItemStack.java @@ -26,6 +26,7 @@ public final class RecipeItemStack implements Predicate { @@ -30,7 +30,7 @@ index 0f96abd0c..f6d929494 100644 int i = aitemstack.length; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java -index ef29599a8..18413e632 100644 +index ef29599a89bc630899c65df9a7004f836787d95e..18413e6327458c6d60d2a0ca8167fc5d75389934 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java @@ -22,6 +22,7 @@ public interface CraftRecipe extends Recipe { diff --git a/patches/server/0125-Flying-squids-Oh-my.patch b/patches/server/0125-Flying-squids-Oh-my.patch index 22d8b91c3..d3b5809e8 100644 --- a/patches/server/0125-Flying-squids-Oh-my.patch +++ b/patches/server/0125-Flying-squids-Oh-my.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a203ae8395269b54143d5cf811bf87a939f5eb54 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 4 Oct 2020 12:00:42 -0500 Subject: [PATCH] Flying squids! Oh my! diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 70b952f10..cee226501 100644 +index 70b952f10a2af547f58069977ee135469d02f84d..cee226501690e1c00983a01ac82bc7384f233c3c 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -51,6 +51,11 @@ public class EntitySquid extends EntityWaterAnimal { @@ -38,7 +38,7 @@ index 70b952f10..cee226501 100644 float f1 = MathHelper.cos(f) * 0.2F; float f2 = -0.1F + this.b.getRandom().nextFloat() * 0.2F; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4d97a2323..70e8092af 100644 +index 4d97a232351a2a70f8992ff1d8d93b1fb976029a..70e8092aff0ffb0b37c969cde0572069fd50112a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -868,10 +868,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0126-Infinity-bow-settings.patch b/patches/server/0126-Infinity-bow-settings.patch index 3575db89d..41f987d6a 100644 --- a/patches/server/0126-Infinity-bow-settings.patch +++ b/patches/server/0126-Infinity-bow-settings.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 2bdb684cd77449ea6808eb3f8f63c62530ed54b2 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 4 Oct 2020 19:08:53 -0500 Subject: [PATCH] Infinity bow settings diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java -index dd6a93dc7..8241f3daf 100644 +index dd6a93dc78a4589f2c65d1738c432def1285f3e2..8241f3dafa5852bed7a3967e7260b36f47198dba 100644 --- a/src/main/java/net/minecraft/server/ItemBow.java +++ b/src/main/java/net/minecraft/server/ItemBow.java @@ -24,7 +24,7 @@ public class ItemBow extends ItemProjectileWeapon implements ItemVanishable { @@ -26,7 +26,7 @@ index dd6a93dc7..8241f3daf 100644 entityhuman.b(StatisticList.ITEM_USED.b(this)); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 70e8092af..5b007f26d 100644 +index 70e8092aff0ffb0b37c969cde0572069fd50112a..5b007f26d91c04681bb5b57494c22fb5ba072405 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -147,6 +147,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0127-Stonecutter-damage.patch b/patches/server/0127-Stonecutter-damage.patch index 4edb15932..9a9a14e5f 100644 --- a/patches/server/0127-Stonecutter-damage.patch +++ b/patches/server/0127-Stonecutter-damage.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 935821006995d9fdb218a63b965e4e12fab39246 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 5 Oct 2020 12:15:14 -0500 Subject: [PATCH] Stonecutter damage diff --git a/src/main/java/net/minecraft/server/BlockStonecutter.java b/src/main/java/net/minecraft/server/BlockStonecutter.java -index 3e57abd33..08ba9e1c4 100644 +index 3e57abd33ee61d78f6d895ec710adb5e5983d42c..08ba9e1c4e916ee09df1bd397b8fc36b4780b9b5 100644 --- a/src/main/java/net/minecraft/server/BlockStonecutter.java +++ b/src/main/java/net/minecraft/server/BlockStonecutter.java @@ -71,4 +71,16 @@ public class BlockStonecutter extends Block { @@ -26,7 +26,7 @@ index 3e57abd33..08ba9e1c4 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index 33804e689..fabadcd7a 100644 +index 33804e68931e8b4145b896eedeab79bde78779f2..fabadcd7a21b0e4ad0e2eeadcd8926dfad6c4b7a 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -480,7 +480,7 @@ public class PathfinderNormal extends PathfinderAbstract { @@ -39,7 +39,7 @@ index 33804e689..fabadcd7a 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5b007f26d..403a503bc 100644 +index 5b007f26d91c04681bb5b57494c22fb5ba072405..403a503bca872c76c760c89143255228f54654dd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -372,6 +372,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0128-Configurable-daylight-cycle.patch b/patches/server/0128-Configurable-daylight-cycle.patch index d45f3a173..7e1e17f5c 100644 --- a/patches/server/0128-Configurable-daylight-cycle.patch +++ b/patches/server/0128-Configurable-daylight-cycle.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 47ce4dc6816e7fe50154a88c8a317b5b8437bf94 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 10 Oct 2020 14:29:55 -0500 Subject: [PATCH] Configurable daylight cycle diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -index 88c3d7efa..fed1ce950 100644 +index 88c3d7efaf467c1c1487f589c2cdbfb6aba734ec..fed1ce95038ead72a663f5a562dd4628fa51e5f5 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java @@ -5,7 +5,7 @@ import java.io.IOException; @@ -18,7 +18,7 @@ index 88c3d7efa..fed1ce950 100644 public PacketPlayOutUpdateTime() {} diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 644ff6879..dd8e284b2 100644 +index a1069b64b3af02cbd5d2808275c09d7680c7c1c6..790473d51ee49340f3f2b17a195e63902a2bf779 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -94,6 +94,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -74,7 +74,7 @@ index 644ff6879..dd8e284b2 100644 public void doMobSpawning(boolean flag, boolean flag1) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 403a503bc..213632534 100644 +index 403a503bca872c76c760c89143255228f54654dd..2136325349c1073b2103da9c6481bd87b6085833 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -116,6 +116,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0129-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0129-Allow-infinite-and-mending-enchantments-together.patch index 96ef80e6c..0417516b0 100644 --- a/patches/server/0129-Allow-infinite-and-mending-enchantments-together.patch +++ b/patches/server/0129-Allow-infinite-and-mending-enchantments-together.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a7ddc4582e35796af188eb96d366142473d23f9f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 13 Oct 2020 20:04:33 -0500 Subject: [PATCH] Allow infinite and mending enchantments together diff --git a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java -index 408cfa460..3d4e34f70 100644 +index 408cfa460920f74e0394ab27101ecb12cceb9c43..3d4e34f7070a48c436284ba7744a94aeacbb7651 100644 --- a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java +++ b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java @@ -23,6 +23,6 @@ public class EnchantmentInfiniteArrows extends Enchantment { @@ -17,7 +17,7 @@ index 408cfa460..3d4e34f70 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index bcb9857b7..bcb397b7f 100644 +index bcb9857b739e81714bc4b5ef378ae7aca640f866..bcb397b7fd326caab1573b741557fe1df99b77cc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -194,6 +194,16 @@ public class PurpurConfig { diff --git a/patches/server/0130-Infinite-fuel-furnace.patch b/patches/server/0130-Infinite-fuel-furnace.patch index a47c20b4b..b8496c70b 100644 --- a/patches/server/0130-Infinite-fuel-furnace.patch +++ b/patches/server/0130-Infinite-fuel-furnace.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 1c9e54e5260a76edafef8b8ce13af7e119e376d9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 19 Oct 2020 15:14:01 -0500 Subject: [PATCH] Infinite fuel furnace diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 1d3c2dd93..1a47f0ae4 100644 +index 1d3c2dd93657fb5dc71ee6b444c585b54619d1e8..1a47f0ae48acca8badc418838bb767bb6fbddbcb 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -266,6 +266,22 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I @@ -41,7 +41,7 @@ index 1d3c2dd93..1a47f0ae4 100644 if (flag1) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 213632534..1dea0f8c0 100644 +index 2136325349c1073b2103da9c6481bd87b6085833..1dea0f8c04bb730e8d0643718845824047e6caf9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -340,6 +340,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0131-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0131-Arrows-should-not-reset-despawn-counter.patch index ab6d35f99..502143a95 100644 --- a/patches/server/0131-Arrows-should-not-reset-despawn-counter.patch +++ b/patches/server/0131-Arrows-should-not-reset-despawn-counter.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From b715fcf66527bc32f71d60aa545cab9bcc62a72e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 4 Nov 2020 13:12:50 -0600 Subject: [PATCH] Arrows should not reset despawn counter @@ -7,7 +7,7 @@ This prevents keeping arrows alive indefinitely (such as when the block the arrow is stuck in gets removed, like a piston head going up/down) diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 7f89b269e..5ec8c9484 100644 +index 7f89b269e37e1046a64c62e1db2a37e6aa4cd54c..5ec8c9484de64b956ec31b578a2a337340d70339 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -243,7 +243,7 @@ public abstract class EntityArrow extends IProjectile { diff --git a/patches/server/0132-Add-tablist-suffix-option-for-afk.patch b/patches/server/0132-Add-tablist-suffix-option-for-afk.patch index dc089c70d..1848f1163 100644 --- a/patches/server/0132-Add-tablist-suffix-option-for-afk.patch +++ b/patches/server/0132-Add-tablist-suffix-option-for-afk.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 216399fd5d1ecee4e7d1735e4ac7703737a44575 Mon Sep 17 00:00:00 2001 From: montlikadani Date: Thu, 12 Nov 2020 11:02:50 +0100 Subject: [PATCH] Add tablist suffix option for afk diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b5f6a98fe..5dd2c4036 100644 +index b5f6a98fe44c30417a3b3496dc45238c99c23ebe..5dd2c4036ee1227a0889fcc7b7e7c8b4bc373119 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1959,7 +1959,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -22,7 +22,7 @@ index b5f6a98fe..5dd2c4036 100644 ((WorldServer) world).everyoneSleeping(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index bcb397b7f..1b9046f50 100644 +index bcb397b7fd326caab1573b741557fe1df99b77cc..1b9046f5059cf9453f5c23cda159f4549aab4b3a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -133,12 +133,14 @@ public class PurpurConfig { diff --git a/patches/server/0133-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0133-Ability-to-re-add-farmland-mechanics-from-Alpha.patch index 4ab89b719..14dfe3532 100644 --- a/patches/server/0133-Ability-to-re-add-farmland-mechanics-from-Alpha.patch +++ b/patches/server/0133-Ability-to-re-add-farmland-mechanics-from-Alpha.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From fe352de5ea8c08cf93aeed17dec059cc82e1c20e Mon Sep 17 00:00:00 2001 From: Yive Date: Sat, 14 Nov 2020 08:06:20 -0800 Subject: [PATCH] Ability to re-add farmland mechanics from Alpha diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java -index 8dd48669c..099e0d3df 100644 +index 8dd48669c29dd51ed4d535dad0b0319f4bb2250c..099e0d3df219408ebe2a741a02e53eb9f7def28e 100644 --- a/src/main/java/net/minecraft/server/BlockSoil.java +++ b/src/main/java/net/minecraft/server/BlockSoil.java @@ -90,6 +90,14 @@ public class BlockSoil extends Block { @@ -24,7 +24,7 @@ index 8dd48669c..099e0d3df 100644 return; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1dea0f8c0..90368559d 100644 +index 1dea0f8c04bb730e8d0643718845824047e6caf9..90368559d64615bb9df3c5d8c4ec23289df09ddd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -336,8 +336,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0134-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0134-Add-adjustable-breeding-cooldown-to-config.patch index e4b2cfe57..97d176038 100644 --- a/patches/server/0134-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0134-Add-adjustable-breeding-cooldown-to-config.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 95246f2429b2699c9612f62a2d8a4501eddaedad Mon Sep 17 00:00:00 2001 From: montlikadani Date: Fri, 13 Nov 2020 17:52:40 +0100 Subject: [PATCH] Add adjustable breeding cooldown to config diff --git a/src/main/java/net/minecraft/server/EntityAnimal.java b/src/main/java/net/minecraft/server/EntityAnimal.java -index bba343542..d9f9e2235 100644 +index bba343542e7e6fa83ec802d97b4c139bb210ab28..d9f9e2235d091e14e5d34bb9a3273e7f56e94295 100644 --- a/src/main/java/net/minecraft/server/EntityAnimal.java +++ b/src/main/java/net/minecraft/server/EntityAnimal.java @@ -120,7 +120,7 @@ public abstract class EntityAnimal extends EntityAgeable { @@ -33,7 +33,7 @@ index bba343542..d9f9e2235 100644 int experience = this.getRandom().nextInt(7) + 1; org.bukkit.event.entity.EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, entityanimal, entityplayer, this.breedItem, experience); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ab97d076c..b4ba9b56a 100644 +index ab97d076c921e1fd3ba69ed4b93d43e930d54bfc..b4ba9b56a9964cefcb24044890855697ce726a08 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -104,6 +104,48 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -94,7 +94,7 @@ index ab97d076c..b4ba9b56a 100644 this.generator = gen; this.world = new CraftWorld((WorldServer) this, gen, env); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 90368559d..a108545c7 100644 +index 90368559d64615bb9df3c5d8c4ec23289df09ddd..a108545c74c9cc7b280eb33637cbe869de72a0f5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -202,6 +202,7 @@ public class PurpurWorldConfig { @@ -114,7 +114,7 @@ index 90368559d..a108545c7 100644 public boolean catSpawning; diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java -index 4904be939..860d07cd6 100644 +index 4904be939c7a4b1d1583fd7b6232c930b79caba6..860d07cd686e0a6e3eebf2deaf6bcecc1fb9dfd2 100644 --- a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java +++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java @@ -49,6 +49,7 @@ public class PurpurCommand extends Command { diff --git a/patches/server/0135-Make-animal-breeding-times-configurable.patch b/patches/server/0135-Make-animal-breeding-times-configurable.patch index efd716cfd..985ae2cfa 100644 --- a/patches/server/0135-Make-animal-breeding-times-configurable.patch +++ b/patches/server/0135-Make-animal-breeding-times-configurable.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7a1cf21f169cf64860ee1ab0dd685876b7fee70f Mon Sep 17 00:00:00 2001 From: jmp Date: Sun, 15 Nov 2020 02:18:15 -0800 Subject: [PATCH] Make animal breeding times configurable diff --git a/src/main/java/net/minecraft/server/EntityAnimal.java b/src/main/java/net/minecraft/server/EntityAnimal.java -index d9f9e2235..dd6725deb 100644 +index d9f9e2235d091e14e5d34bb9a3273e7f56e94295..dd6725debe0cf72dce13b6f2cac0556060e0eb41 100644 --- a/src/main/java/net/minecraft/server/EntityAnimal.java +++ b/src/main/java/net/minecraft/server/EntityAnimal.java @@ -13,6 +13,7 @@ public abstract class EntityAnimal extends EntityAgeable { @@ -30,7 +30,7 @@ index d9f9e2235..dd6725deb 100644 entityanimal.resetLove(); entityageable.setBaby(true); diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index d8354ec4d..ded4e10f5 100644 +index d8354ec4d19fc3fbddc2551ee217acb137482e63..ded4e10f5082fb5aa25368d9035affba287c3345 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -100,6 +100,11 @@ public class EntityBee extends EntityAnimal implements IEntityAngerable, EntityB @@ -46,7 +46,7 @@ index d8354ec4d..ded4e10f5 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index 05929d5c5..a6ce4ca27 100644 +index 05929d5c539a738e6b6e8d32d9b0f843a665f4f6..a6ce4ca27c9670655a8f66bfc624f12659613379 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -58,6 +58,11 @@ public class EntityCat extends EntityTameableAnimal { @@ -62,7 +62,7 @@ index 05929d5c5..a6ce4ca27 100644 public MinecraftKey eU() { diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java -index a16ecd7ed..26f783349 100644 +index a16ecd7edcd0ed081fff254d1f1429b32a4dcfb3..26f7833496ceaf5c6f67ac7fb276e1f82e51de07 100644 --- a/src/main/java/net/minecraft/server/EntityChicken.java +++ b/src/main/java/net/minecraft/server/EntityChicken.java @@ -36,6 +36,11 @@ public class EntityChicken extends EntityAnimal { @@ -78,7 +78,7 @@ index a16ecd7ed..26f783349 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 1219b0aa9..63497ca02 100644 +index 1219b0aa9c62bc9a1bda45cc9e9a27f14a28fe2e..63497ca0266073dc0a16b7dc22641d08c3eaf400 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -21,6 +21,11 @@ public class EntityCow extends EntityAnimal { @@ -94,7 +94,7 @@ index 1219b0aa9..63497ca02 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index f5defe471..e87f5aeb9 100644 +index f5defe4713c6be7d32fb2116110516717460284e..e87f5aeb97fc35ff2b3464f31a2ec18432774cd4 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -86,6 +86,11 @@ public class EntityFox extends EntityAnimal { @@ -110,7 +110,7 @@ index f5defe471..e87f5aeb9 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHoglin.java b/src/main/java/net/minecraft/server/EntityHoglin.java -index 548ff4449..a1578aade 100644 +index 548ff4449faca0abdf72487276fe49207bacfe17..a1578aade4a535144b5e40277c902f2e9ab9e940 100644 --- a/src/main/java/net/minecraft/server/EntityHoglin.java +++ b/src/main/java/net/minecraft/server/EntityHoglin.java @@ -30,6 +30,11 @@ public class EntityHoglin extends EntityAnimal implements IMonster, IOglin { @@ -126,7 +126,7 @@ index 548ff4449..a1578aade 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java -index 0415a4d1f..b19995f96 100644 +index 0415a4d1f328f117ee676156114acb3599aec202..b19995f962180a44ff388d58a26cc5782d0826e4 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java @@ -17,6 +17,11 @@ public class EntityHorse extends EntityHorseAbstract { @@ -142,7 +142,7 @@ index 0415a4d1f..b19995f96 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java -index cb8aee569..f6421bb45 100644 +index cb8aee5691ff4ecaa6ae60f1637b1852d3b6c162..f6421bb45c5e6adf39fdc085efe2b2f500b76c0c 100644 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java @@ -13,6 +13,11 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract { @@ -158,7 +158,7 @@ index cb8aee569..f6421bb45 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHorseMule.java b/src/main/java/net/minecraft/server/EntityHorseMule.java -index 243aeb736..30cbc505d 100644 +index 243aeb736e350418e9476819bbfec0e7ab59f92f..30cbc505d2b0f4d3247edfd271de8daab023eb2a 100644 --- a/src/main/java/net/minecraft/server/EntityHorseMule.java +++ b/src/main/java/net/minecraft/server/EntityHorseMule.java @@ -13,6 +13,11 @@ public class EntityHorseMule extends EntityHorseChestedAbstract { @@ -174,7 +174,7 @@ index 243aeb736..30cbc505d 100644 @Override protected SoundEffect getSoundAmbient() { diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index e2c6a5807..408db52ca 100644 +index e2c6a5807a4554a7eebb148e40f1f8a1d979df5e..408db52cacbdfbca8af0a6a8e913b0128a3f5a76 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -22,6 +22,11 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -190,7 +190,7 @@ index e2c6a5807..408db52ca 100644 public static AttributeProvider.Builder eL() { diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java -index 559ba5097..2121a6c97 100644 +index 559ba50977147b8e2a0e7c1e7dc281faabd7f292..2121a6c979ba2ea7cb596ca6081750d2f8c7df9f 100644 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java @@ -18,6 +18,11 @@ public class EntityHorseZombie extends EntityHorseAbstract { @@ -206,7 +206,7 @@ index 559ba5097..2121a6c97 100644 public static AttributeProvider.Builder eL() { diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index 109927786..3bc6e6df9 100644 +index 1099277868f92fdaf4b0ec3a982f26f20ead7369..3bc6e6df9e0107debe5b15f5f7aad97ad336f304 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -57,6 +57,11 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -222,7 +222,7 @@ index 109927786..3bc6e6df9 100644 public void setStrength(int i) { diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index 7966b34f8..eb1f95d8b 100644 +index 7966b34f8d202d2260a35baa4cd594e4def89257..eb1f95d8bae4bc2580849614ba879dd1a8792ecb 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -30,6 +30,11 @@ public class EntityMushroomCow extends EntityCow implements IShearable { @@ -238,7 +238,7 @@ index 7966b34f8..eb1f95d8b 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index 2f8275cd6..a5be10dfb 100644 +index 2f8275cd6b3cde0d3f949219f67ba7f0e0031dc3..a5be10dfb0de08b0d97265278b1f11ad1e94b821 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -26,6 +26,11 @@ public class EntityOcelot extends EntityAnimal { @@ -254,7 +254,7 @@ index 2f8275cd6..a5be10dfb 100644 private boolean isTrusting() { diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java -index eafae5516..c70180fdd 100644 +index eafae5516b9b5d51aa943796557926cf61476d2b..c70180fddb829419b9cc5188766e9130f9b8a94a 100644 --- a/src/main/java/net/minecraft/server/EntityPanda.java +++ b/src/main/java/net/minecraft/server/EntityPanda.java @@ -65,6 +65,11 @@ public class EntityPanda extends EntityAnimal { @@ -270,7 +270,7 @@ index eafae5516..c70180fdd 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java -index e402d4a77..398e92bf7 100644 +index e402d4a77b57b8b12b7575a9793c30d7acfa7fb0..398e92bf7053c411bd98626efe4261e15256d3ee 100644 --- a/src/main/java/net/minecraft/server/EntityParrot.java +++ b/src/main/java/net/minecraft/server/EntityParrot.java @@ -115,6 +115,11 @@ public class EntityParrot extends EntityPerchable implements EntityBird { @@ -286,7 +286,7 @@ index e402d4a77..398e92bf7 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index dade0bb29..7172e8cab 100644 +index dade0bb29422ebd68fae0edb74cbbf6d3ab89d64..7172e8cabf5b715ae9a1087b0d11e6cee81ea6e4 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -29,6 +29,11 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable { @@ -302,7 +302,7 @@ index dade0bb29..7172e8cab 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java -index 3d649843f..40395dd7e 100644 +index 3d649843f565d2c8820b525c199bd2b9f9120cc7..40395dd7ea515e51a189d014a3274d15dc1d8ee6 100644 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java @@ -67,6 +67,11 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable { @@ -318,7 +318,7 @@ index 3d649843f..40395dd7e 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index b766a27e9..654cd036a 100644 +index b766a27e98e19bffd3fe8f81f750750ae7681d02..654cd036a8e4aa4499f10f528b684e003c469c9a 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -30,6 +30,11 @@ public class EntityRabbit extends EntityAnimal { @@ -334,7 +334,7 @@ index b766a27e9..654cd036a 100644 // CraftBukkit start - code from constructor diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java -index a151d4295..32130c068 100644 +index a151d4295c02930687a23212647de60cce5405ca..32130c0681501e3e5a47b199f0bb39daac416ed3 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -66,6 +66,11 @@ public class EntitySheep extends EntityAnimal implements IShearable { @@ -350,7 +350,7 @@ index a151d4295..32130c068 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityStrider.java b/src/main/java/net/minecraft/server/EntityStrider.java -index 172867f50..9ab1b5af6 100644 +index 172867f50d0dba45a296b029c8fa85f1a19a49dc..9ab1b5af68774fa4d4da89195fdb91172370d43d 100644 --- a/src/main/java/net/minecraft/server/EntityStrider.java +++ b/src/main/java/net/minecraft/server/EntityStrider.java @@ -38,6 +38,11 @@ public class EntityStrider extends EntityAnimal implements ISteerable, ISaddleab @@ -366,7 +366,7 @@ index 172867f50..9ab1b5af6 100644 public static boolean c(EntityTypes entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) { diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index 2b34e6cf3..067f7f28b 100644 +index 2b34e6cf3b86319bd2875d92b63902889fec32a8..067f7f28b02b388d56b93b1ed8274799757196e6 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -37,6 +37,11 @@ public class EntityTurtle extends EntityAnimal { @@ -382,7 +382,7 @@ index 2b34e6cf3..067f7f28b 100644 public void setHomePos(BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index 9ae716859..6c25f667e 100644 +index 9ae7168595dd66860e09ef87f946b18b010e54b1..6c25f667eecdf345289a0dbf885c9d71c6a26958 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -48,6 +48,11 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable @@ -398,7 +398,7 @@ index 9ae716859..6c25f667e 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a108545c7..992a0babb 100644 +index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe2f56f00c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -423,10 +423,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0136-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0136-Apply-display-names-from-item-forms-of-entities-to-e.patch index 17a176e77..52e1a6667 100644 --- a/patches/server/0136-Apply-display-names-from-item-forms-of-entities-to-e.patch +++ b/patches/server/0136-Apply-display-names-from-item-forms-of-entities-to-e.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From cf2e8a94b620b76cf7c06d9cd5bd4a32c4d19766 Mon Sep 17 00:00:00 2001 From: jmp Date: Tue, 17 Nov 2020 03:23:48 -0800 Subject: [PATCH] Apply display names from item forms of entities to entities @@ -6,7 +6,7 @@ Subject: [PATCH] Apply display names from item forms of entities to entities diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index df3fc8302..a75de169f 100644 +index df3fc83029ea9d06045a3f132f8e85b0c33b0649..a75de169feb7b10fe7860216303fbf3db7d535ba 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -546,7 +546,13 @@ public class EntityArmorStand extends EntityLiving { @@ -25,7 +25,7 @@ index df3fc8302..a75de169f 100644 } diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java -index d53bbe316..bc558c54c 100644 +index d53bbe31694c2d88939332691cdf145c46099e22..bc558c54c9e74e2158a5835173e6068cfaeffcc0 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java @@ -155,7 +155,13 @@ public class EntityBoat extends Entity { @@ -52,7 +52,7 @@ index d53bbe316..bc558c54c 100644 switch (this.getType()) { case OAK: diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 80589799a..2fef69673 100644 +index 80589799ab08228d9e49afdf4570fa781092e5c5..2fef6967323145049a45d8cc44d50c788fb3e8be 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1368,7 +1368,13 @@ public abstract class EntityInsentient extends EntityLiving { @@ -86,7 +86,7 @@ index 80589799a..2fef69673 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java -index 16c8f2cdf..19460d885 100644 +index 16c8f2cdf7120337bec6f1d28822f3219c7d2d8f..19460d885682b1f182dcfbe13e11dae3fd98248d 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -199,7 +199,13 @@ public class EntityItemFrame extends EntityHanging { @@ -105,7 +105,7 @@ index 16c8f2cdf..19460d885 100644 if (!itemstack.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/EntityPainting.java b/src/main/java/net/minecraft/server/EntityPainting.java -index 4b7cd7c59..d01fc8b11 100644 +index 4b7cd7c59fefbd56d38e0301b08d06ce92c9d8a2..d01fc8b11026536be30c8149aca253280524811f 100644 --- a/src/main/java/net/minecraft/server/EntityPainting.java +++ b/src/main/java/net/minecraft/server/EntityPainting.java @@ -92,7 +92,13 @@ public class EntityPainting extends EntityHanging { @@ -124,7 +124,7 @@ index 4b7cd7c59..d01fc8b11 100644 } diff --git a/src/main/java/net/minecraft/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java -index c9a5d3b58..315faee9e 100644 +index c9a5d3b583076cf8f2f32b12c142beb3f5e22dc0..315faee9e35d27071a62ea1d335dfbe5351582ca 100644 --- a/src/main/java/net/minecraft/server/ItemArmorStand.java +++ b/src/main/java/net/minecraft/server/ItemArmorStand.java @@ -43,6 +43,14 @@ public class ItemArmorStand extends Item { @@ -143,7 +143,7 @@ index c9a5d3b58..315faee9e 100644 world.playSound((EntityHuman) null, entityarmorstand.locX(), entityarmorstand.locY(), entityarmorstand.locZ(), SoundEffects.ENTITY_ARMOR_STAND_PLACE, SoundCategory.BLOCKS, 0.75F, 0.8F); } diff --git a/src/main/java/net/minecraft/server/ItemBoat.java b/src/main/java/net/minecraft/server/ItemBoat.java -index 0580ce55e..6183da7ad 100644 +index 0580ce55ec945b5bc6ce8c5d0cee13b03ccc7d1a..6183da7ad2a458f4ada288ec82fdaf097d771122 100644 --- a/src/main/java/net/minecraft/server/ItemBoat.java +++ b/src/main/java/net/minecraft/server/ItemBoat.java @@ -52,6 +52,11 @@ public class ItemBoat extends Item { @@ -159,7 +159,7 @@ index 0580ce55e..6183da7ad 100644 return InteractionResultWrapper.fail(itemstack); } else { diff --git a/src/main/java/net/minecraft/server/ItemHanging.java b/src/main/java/net/minecraft/server/ItemHanging.java -index a3eaeeda8..f2f800087 100644 +index a3eaeeda875d96fe4b047bd6bf993018722c96b9..f2f800087adb0238b4b672b9f6f4c8c4836f2891 100644 --- a/src/main/java/net/minecraft/server/ItemHanging.java +++ b/src/main/java/net/minecraft/server/ItemHanging.java @@ -26,7 +26,7 @@ public class ItemHanging extends Item { @@ -184,7 +184,7 @@ index a3eaeeda8..f2f800087 100644 if (((EntityHanging) object).survives()) { diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 40f553e39..7161eba52 100644 +index 40f553e3950318f5a1940e3dccd0018653770fdb..7161eba52ece2b4d9ed982598642f486fd314965 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -738,6 +738,7 @@ public final class ItemStack { @@ -196,7 +196,7 @@ index 40f553e39..7161eba52 100644 NBTTagCompound nbttagcompound = this.a("display"); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 992a0babb..af3f910e6 100644 +index 992a0babbed1eee0c0d566612b54adfe2f56f00c..af3f910e639a17dbcade8609a3c8c42b0d138cbb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -83,8 +83,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0137-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0137-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch index 5ae4ead76..3f9ef8974 100644 --- a/patches/server/0137-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch +++ b/patches/server/0137-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From ad33668ca7eeebb9aef1390ac03af1ae56ab62ba Mon Sep 17 00:00:00 2001 From: jmp Date: Tue, 17 Nov 2020 13:12:09 -0800 Subject: [PATCH] Set name visible when using a Name Tag on an Armor Stand diff --git a/src/main/java/net/minecraft/server/ItemNameTag.java b/src/main/java/net/minecraft/server/ItemNameTag.java -index 01163ce38..a7efce973 100644 +index 01163ce38602f9345f00ee0535b4e73be7c6d735..a7efce97318fcf95d98f33ad4ac2da69a1ba0df0 100644 --- a/src/main/java/net/minecraft/server/ItemNameTag.java +++ b/src/main/java/net/minecraft/server/ItemNameTag.java @@ -11,6 +11,11 @@ public class ItemNameTag extends Item { @@ -21,7 +21,7 @@ index 01163ce38..a7efce973 100644 ((EntityInsentient) entityliving).setPersistent(); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index af3f910e6..a77debc7a 100644 +index af3f910e639a17dbcade8609a3c8c42b0d138cbb..a77debc7a8923693733d748ce9abd3ae2d057fb9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -84,9 +84,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0138-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0138-Add-twisting-and-weeping-vines-growth-rates.patch index c0d4a64c0..8cea81f2a 100644 --- a/patches/server/0138-Add-twisting-and-weeping-vines-growth-rates.patch +++ b/patches/server/0138-Add-twisting-and-weeping-vines-growth-rates.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7b6bad5e7db46f18f20675d94dd5a1f69b636865 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 22 Nov 2020 06:02:32 -0600 Subject: [PATCH] Add twisting and weeping vines growth rates diff --git a/src/main/java/net/minecraft/server/BlockGrowingTop.java b/src/main/java/net/minecraft/server/BlockGrowingTop.java -index 7963411be..6c084ad5c 100644 +index 7963411be990fed8eb0ffca3eba35d15a9b8d7bd..6c084ad5cda41425eed04465d942f6a73968cd61 100644 --- a/src/main/java/net/minecraft/server/BlockGrowingTop.java +++ b/src/main/java/net/minecraft/server/BlockGrowingTop.java @@ -23,9 +23,11 @@ public abstract class BlockGrowingTop extends BlockGrowingAbstract implements IB @@ -22,7 +22,7 @@ index 7963411be..6c084ad5c 100644 if (this.h(worldserver.getType(blockposition1))) { diff --git a/src/main/java/net/minecraft/server/BlockKelp.java b/src/main/java/net/minecraft/server/BlockKelp.java -index a243aaed5..2a7a6e594 100644 +index a243aaed58454ae304c988df8a8a090a8236075e..2a7a6e5943f2ff87815c398ffec01bb78d320690 100644 --- a/src/main/java/net/minecraft/server/BlockKelp.java +++ b/src/main/java/net/minecraft/server/BlockKelp.java @@ -53,4 +53,10 @@ public class BlockKelp extends BlockGrowingTop implements IFluidContainer { @@ -37,7 +37,7 @@ index a243aaed5..2a7a6e594 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/BlockTwistingVines.java b/src/main/java/net/minecraft/server/BlockTwistingVines.java -index be3816746..146638111 100644 +index be381674632c49d7465dd7d52084b52f45194b54..146638111c56ec81ab46b514d45a7cc8aac2b36a 100644 --- a/src/main/java/net/minecraft/server/BlockTwistingVines.java +++ b/src/main/java/net/minecraft/server/BlockTwistingVines.java @@ -24,4 +24,10 @@ public class BlockTwistingVines extends BlockGrowingTop { @@ -52,7 +52,7 @@ index be3816746..146638111 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/BlockWeepingVines.java b/src/main/java/net/minecraft/server/BlockWeepingVines.java -index 23dca1940..94ffadb91 100644 +index 23dca1940375d243531fc4a891f04e937ae2f48f..94ffadb91fec65a721cf0c8fa98bad708a2ca269 100644 --- a/src/main/java/net/minecraft/server/BlockWeepingVines.java +++ b/src/main/java/net/minecraft/server/BlockWeepingVines.java @@ -24,4 +24,10 @@ public class BlockWeepingVines extends BlockGrowingTop { @@ -67,7 +67,7 @@ index 23dca1940..94ffadb91 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a77debc7a..a7eb31a3e 100644 +index a77debc7a8923693733d748ce9abd3ae2d057fb9..a7eb31a3ed80ebe6bfc7d4187734d9bcbe9b537e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -408,6 +408,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0139-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0139-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch index 0aecb06c8..97565ac0d 100644 --- a/patches/server/0139-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch +++ b/patches/server/0139-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From afd88ca7d0c5f2016b0e31e6e10c8a1ec31e7150 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 22 Nov 2020 20:13:27 -0600 Subject: [PATCH] Kelp weeping and twisting vines configurable max growth age diff --git a/src/main/java/net/minecraft/server/BlockGrowingTop.java b/src/main/java/net/minecraft/server/BlockGrowingTop.java -index 6c084ad5c..6d49422c3 100644 +index 6c084ad5cda41425eed04465d942f6a73968cd61..6d49422c3358b06369e1a31ee5580ff4a0057c5f 100644 --- a/src/main/java/net/minecraft/server/BlockGrowingTop.java +++ b/src/main/java/net/minecraft/server/BlockGrowingTop.java @@ -15,7 +15,7 @@ public abstract class BlockGrowingTop extends BlockGrowingAbstract implements IB @@ -47,7 +47,7 @@ index 6c084ad5c..6d49422c3 100644 } diff --git a/src/main/java/net/minecraft/server/BlockKelp.java b/src/main/java/net/minecraft/server/BlockKelp.java -index 2a7a6e594..b35c115e3 100644 +index 2a7a6e5943f2ff87815c398ffec01bb78d320690..b35c115e34cf5f7a24cd26ca31c19a63c82e0080 100644 --- a/src/main/java/net/minecraft/server/BlockKelp.java +++ b/src/main/java/net/minecraft/server/BlockKelp.java @@ -58,5 +58,9 @@ public class BlockKelp extends BlockGrowingTop implements IFluidContainer { @@ -61,7 +61,7 @@ index 2a7a6e594..b35c115e3 100644 // Purpur end } diff --git a/src/main/java/net/minecraft/server/BlockTwistingVines.java b/src/main/java/net/minecraft/server/BlockTwistingVines.java -index 146638111..71b9b7183 100644 +index 146638111c56ec81ab46b514d45a7cc8aac2b36a..71b9b7183df5702f2753c7372d0c491b2230b365 100644 --- a/src/main/java/net/minecraft/server/BlockTwistingVines.java +++ b/src/main/java/net/minecraft/server/BlockTwistingVines.java @@ -29,5 +29,9 @@ public class BlockTwistingVines extends BlockGrowingTop { @@ -75,7 +75,7 @@ index 146638111..71b9b7183 100644 // Purpur end } diff --git a/src/main/java/net/minecraft/server/BlockWeepingVines.java b/src/main/java/net/minecraft/server/BlockWeepingVines.java -index 94ffadb91..067df63ab 100644 +index 94ffadb91fec65a721cf0c8fa98bad708a2ca269..067df63ab27ecb9fe0a0d012b16efbd546fdfff7 100644 --- a/src/main/java/net/minecraft/server/BlockWeepingVines.java +++ b/src/main/java/net/minecraft/server/BlockWeepingVines.java @@ -29,5 +29,9 @@ public class BlockWeepingVines extends BlockGrowingTop { @@ -89,7 +89,7 @@ index 94ffadb91..067df63ab 100644 // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a7eb31a3e..9b91ae118 100644 +index a7eb31a3ed80ebe6bfc7d4187734d9bcbe9b537e..9b91ae1186a057722cc84173a43e9d1138c8a8ca 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -355,6 +355,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0140-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0140-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch index 16d582a79..393cd4332 100644 --- a/patches/server/0140-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch +++ b/patches/server/0140-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 0719b37ccfd748aeb7ac5d1078c5c706e007b52a Mon Sep 17 00:00:00 2001 From: jmp Date: Sun, 22 Nov 2020 22:17:53 -0800 Subject: [PATCH] Add config for allowing Endermen to despawn even while @@ -8,7 +8,7 @@ This should help to reduce the amount of dirt, gravel, grass, and etc. that Endermen like to randomly place all over the world. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 995849212..acb2b3ed0 100644 +index 995849212c25568d3aa28ada78babf8b8e669960..acb2b3ed04ea0bf19335415310ce22cd076dd92a 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -372,7 +372,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { @@ -21,7 +21,7 @@ index 995849212..acb2b3ed0 100644 static class PathfinderGoalEndermanPickupBlock extends PathfinderGoal { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9b91ae118..d14a4955e 100644 +index 9b91ae1186a057722cc84173a43e9d1138c8a8ca..d14a4955e5e2fc805b8fb6b46c9750ccc9955df0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -579,10 +579,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0141-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0141-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch index 68ba192d5..e50cd2f83 100644 --- a/patches/server/0141-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch +++ b/patches/server/0141-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 1e31e7ae21b85e132d00858d317a396b5dc9e774 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 24 Nov 2020 04:30:46 -0600 Subject: [PATCH] Add critical hit check to EntityDamagedByEntityEvent diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index deb6c9342..84e500fa7 100644 +index deb6c93426e35c47fbe23dba71bd1712f4dba652..84e500fa7f3f22cfa344cfcc0fb8140057a6f112 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -73,6 +73,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -33,7 +33,7 @@ index deb6c9342..84e500fa7 100644 if (flag5) { if (i > 0) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a17f449b5..110db570c 100644 +index a17f449b543d2ab4191b6397835856e1a7d664e3..110db570c8c917e6b9eeab534e47ce9135ad09c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1048,7 +1048,7 @@ public class CraftEventFactory { diff --git a/patches/server/0142-Add-configurable-snowball-damage.patch b/patches/server/0142-Add-configurable-snowball-damage.patch index 9b2932b90..e12c41dc3 100644 --- a/patches/server/0142-Add-configurable-snowball-damage.patch +++ b/patches/server/0142-Add-configurable-snowball-damage.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From fea65f7fc8890a9789daac9d49fb13d68af9a09b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 24 Nov 2020 05:32:02 -0600 Subject: [PATCH] Add configurable snowball damage diff --git a/src/main/java/net/minecraft/server/EntitySnowball.java b/src/main/java/net/minecraft/server/EntitySnowball.java -index 34a5f481e..d7bab4446 100644 +index 34a5f481e6ed1357861dca15fb4013ec8484a292..d7bab4446a5a8eef98c10b1f6eb89de90365dfeb 100644 --- a/src/main/java/net/minecraft/server/EntitySnowball.java +++ b/src/main/java/net/minecraft/server/EntitySnowball.java @@ -29,7 +29,7 @@ public class EntitySnowball extends EntityProjectileThrowable { @@ -18,7 +18,7 @@ index 34a5f481e..d7bab4446 100644 entity.damageEntity(DamageSource.projectile(this, this.getShooter()), (float) i); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d14a4955e..effcabfd6 100644 +index d14a4955e5e2fc805b8fb6b46c9750ccc9955df0..effcabfd6b4cfb0ff2bdf058b60923f2162d9ce4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -196,6 +196,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0143-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0143-Zombie-break-door-minimum-difficulty-option.patch index d2d6d21ad..b5991fd41 100644 --- a/patches/server/0143-Zombie-break-door-minimum-difficulty-option.patch +++ b/patches/server/0143-Zombie-break-door-minimum-difficulty-option.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 8393c0a79be6066553ed5ec44bab490ee767a79c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Nov 2020 10:33:33 -0600 Subject: [PATCH] Zombie break door minimum difficulty option diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java b/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java -index 7488a1292..23870a271 100644 +index 7488a12926c5ee4adc3bc1fa3973988350381544..23870a271b759a953a095df835e08ea2a09f4218 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java @@ -13,7 +13,7 @@ public class PathfinderGoalBreakDoor extends PathfinderGoalDoorInteract { @@ -40,7 +40,7 @@ index 7488a1292..23870a271 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index effcabfd6..ee7b5efcf 100644 +index effcabfd6b4cfb0ff2bdf058b60923f2162d9ce4..ee7b5efcfc0e185f0dfec50054ff53ee46d48d59 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -2,6 +2,7 @@ package net.pl3x.purpur; diff --git a/patches/server/0144-Add-demo-command.patch b/patches/server/0144-Add-demo-command.patch index 420dc7c7c..49545f62c 100644 --- a/patches/server/0144-Add-demo-command.patch +++ b/patches/server/0144-Add-demo-command.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 5549712cd9a7bb9c0b7d17972c6f7b6848c884ce Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 30 Nov 2020 03:12:04 -0600 Subject: [PATCH] Add demo command diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java -index 1a13eb47e..ccd0be059 100644 +index 1a13eb47e07776a53fab4ca38dcb48e55fb77b21..ccd0be059f4d7b95d4ec58c0d4fc744a94fec3fd 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -107,6 +107,7 @@ public class CommandDispatcher { @@ -17,7 +17,7 @@ index 1a13eb47e..ccd0be059 100644 } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutGameStateChange.java b/src/main/java/net/minecraft/server/PacketPlayOutGameStateChange.java -index 08cbc787e..57d39ed44 100644 +index 08cbc787e2bf6587878bdeffa7248e5d23cdcf98..57d39ed441ec7be933f4fce48225f527db7e6a3c 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutGameStateChange.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutGameStateChange.java @@ -11,7 +11,7 @@ public class PacketPlayOutGameStateChange implements Packet Date: Mon, 30 Nov 2020 06:03:06 -0600 Subject: [PATCH] Left handed API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index eaad222fd..eb1d0d8e8 100644 +index eaad222fd38a4db4074db04c931bcff7a9ca5e24..eb1d0d8e8962b5338b3ea7a306130d0af77eaca0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -85,4 +85,14 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { diff --git a/patches/server/0146-Origami-Fix-ProtocolLib-issues-on-Java-15.patch b/patches/server/0146-Origami-Fix-ProtocolLib-issues-on-Java-15.patch index 218a6fe15..d55e0c052 100644 --- a/patches/server/0146-Origami-Fix-ProtocolLib-issues-on-Java-15.patch +++ b/patches/server/0146-Origami-Fix-ProtocolLib-issues-on-Java-15.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 0e99c21b999e9673bcd17d183dac08ac04829f26 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Mon, 19 Oct 2020 17:20:53 +0100 Subject: [PATCH] Origami - Fix ProtocolLib issues on Java 15 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 7a2a8acea..8a452173c 100644 +index 7a2a8acea90a0e6f08f366c3d397a515f38e5395..8a452173c04ce5d1f7859845b99c145246abbef1 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -392,9 +392,9 @@ public class NetworkManager extends SimpleChannelInboundHandler> { diff --git a/patches/server/0147-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0147-Changeable-Mob-Left-Handed-Chance.patch index bc2442022..3b28ab4c1 100644 --- a/patches/server/0147-Changeable-Mob-Left-Handed-Chance.patch +++ b/patches/server/0147-Changeable-Mob-Left-Handed-Chance.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d1531f9f0a75a15de65bc52ec01e84b5aa2cfab2 Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich Date: Mon, 30 Nov 2020 11:40:11 -0500 Subject: [PATCH] Changeable Mob Left Handed Chance diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 2fef69673..e2d7c20e6 100644 +index 2fef6967323145049a45d8cc44d50c788fb3e8be..e2d7c20e66b5a6c3d6037ee3e15d1ce676c29c97 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1135,7 +1135,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -18,7 +18,7 @@ index 2fef69673..e2d7c20e6 100644 } else { this.setLeftHanded(false); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ee7b5efcf..090a8c681 100644 +index ee7b5efcfc0e185f0dfec50054ff53ee46d48d59..090a8c681c4288bff1efef1f782d2bf36abaef77 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -129,8 +129,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0148-Add-boat-fall-damage-config.patch b/patches/server/0148-Add-boat-fall-damage-config.patch index 48887253e..2029950c6 100644 --- a/patches/server/0148-Add-boat-fall-damage-config.patch +++ b/patches/server/0148-Add-boat-fall-damage-config.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 3de6971db0187b4c21c0b7906504e44eb9a00e31 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 30 Nov 2020 19:36:35 -0600 Subject: [PATCH] Add boat fall damage config diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5dd2c4036..50ea875a3 100644 +index 5dd2c4036ee1227a0889fcc7b7e7c8b4bc373119..50ea875a3b31ea920442ea2cf3d3359cee1d62dc 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1017,7 +1017,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -27,7 +27,7 @@ index 5dd2c4036..50ea875a3 100644 if (!flag && isSpawnInvulnerable() && damagesource != DamageSource.OUT_OF_WORLD) { // Purpur diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 090a8c681..1e5dc4366 100644 +index 090a8c681c4288bff1efef1f782d2bf36abaef77..1e5dc4366ccc85002e9b0ea0cfbcde46d39017d2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -206,6 +206,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0149-Config-migration-disable-saving-projectiles-to-disk-.patch b/patches/server/0149-Config-migration-disable-saving-projectiles-to-disk-.patch index 5c6057474..d073a8e9c 100644 --- a/patches/server/0149-Config-migration-disable-saving-projectiles-to-disk-.patch +++ b/patches/server/0149-Config-migration-disable-saving-projectiles-to-disk-.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 78821df0adb6d495051f69b39f8032221ac4a9de Mon Sep 17 00:00:00 2001 From: jmp Date: Mon, 30 Nov 2020 18:30:13 -0800 Subject: [PATCH] Config migration: disable saving projectiles to disk -> @@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: disable saving projectiles to disk -> diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index deb82f76a..d01982330 100644 +index deb82f76a1394713b7a0f594f9b6f9a756b6e9f9..d01982330edcaad92e2f398abe2ae6169a3f7600 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,6 +1,7 @@ @@ -36,7 +36,7 @@ index deb82f76a..d01982330 100644 public static String afkBroadcastBack = "§e§o%s is no longer AFK"; public static String afkTabListPrefix = "[AFK] "; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1e5dc4366..d2c07bd07 100644 +index 1e5dc4366ccc85002e9b0ea0cfbcde46d39017d2..d2c07bd07406f324a79b0543101cb2d391fa8dec 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0150-Snow-Golem-rate-of-fire-config.patch b/patches/server/0150-Snow-Golem-rate-of-fire-config.patch index 44c46fa26..1bdf2cb1b 100644 --- a/patches/server/0150-Snow-Golem-rate-of-fire-config.patch +++ b/patches/server/0150-Snow-Golem-rate-of-fire-config.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d76ca38a0a56bb661a2b565d7451199af6d24de9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 1 Dec 2020 16:50:36 -0500 Subject: [PATCH] Snow Golem rate of fire config @@ -10,7 +10,7 @@ If min-shoot-interval-ticks and max-shoot-interval-ticks are both set to 0, snow golems won't shoot any snowballs. diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index e980da14c..e5b3d298f 100644 +index e980da14cf4f34c87a88ffd2b908223808404966..e5b3d298f52006f39a36cfdd95097e7b4f89939a 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java @@ -29,7 +29,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt @@ -23,7 +23,7 @@ index e980da14c..e5b3d298f 100644 this.goalSelector.a(3, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F)); this.goalSelector.a(4, new PathfinderGoalRandomLookaround(this)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d2c07bd07..7f40f1187 100644 +index d2c07bd07406f324a79b0543101cb2d391fa8dec..7f40f118723e04491d48227304fb7b1758ed7d0e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -970,12 +970,20 @@ public class PurpurWorldConfig { diff --git a/patches/server/0151-PaperPR-Apply-advancements-async.patch b/patches/server/0151-PaperPR-Apply-advancements-async.patch index f9b6be80f..8378cef92 100644 --- a/patches/server/0151-PaperPR-Apply-advancements-async.patch +++ b/patches/server/0151-PaperPR-Apply-advancements-async.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From e88f1042add937869deed2a768ead73f108e5ff5 Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Thu, 20 Aug 2020 17:57:02 +0200 Subject: [PATCH] PaperPR - Apply advancements async diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index eaa1063ff..a3b89a4f2 100644 +index eaa1063ff2bc5621e93043c4de41ca62f1323fde..a3b89a4f2a291b9a9bf847e059c6b926ea9db9b2 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -63,6 +63,7 @@ public class AdvancementDataPlayer { @@ -17,7 +17,7 @@ index eaa1063ff..a3b89a4f2 100644 this.player = entityplayer; } diff --git a/src/main/java/net/minecraft/server/CriterionProgress.java b/src/main/java/net/minecraft/server/CriterionProgress.java -index 98c3884f4..244b58a7c 100644 +index 98c3884f478aed1eba82c15f258ebfa1c7203b14..244b58a7c41d2b0ba3117550282e68a168439708 100644 --- a/src/main/java/net/minecraft/server/CriterionProgress.java +++ b/src/main/java/net/minecraft/server/CriterionProgress.java @@ -10,8 +10,9 @@ import java.util.Date; @@ -51,7 +51,7 @@ index 98c3884f4..244b58a7c 100644 } catch (ParseException parseexception) { throw new JsonSyntaxException("Invalid datetime: " + s, parseexception); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 50ea875a3..cc6a54e06 100644 +index 50ea875a3b31ea920442ea2cf3d3359cee1d62dc..cc6a54e06a4fe91a19dee0397192e9884597835e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -49,7 +49,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -111,7 +111,7 @@ index 50ea875a3..cc6a54e06 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fd75444ce..95d93cd8e 100644 +index 2374a7ee018493795389b21848289395168db422..6c9a8d92e70106635699e55367eed60ac95c3290 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2315,6 +2315,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 2 Dec 2020 03:07:58 -0800 Subject: [PATCH] PaperPR - Config option for Piglins guarding chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 2452f54d9..3ff2fa66b 100644 +index 2452f54d96cab2d93140c64e25d9b799cbc94caa..3ff2fa66b940acbe8e72fb03bf7a86398ab69613 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -669,6 +669,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 2452f54d9..3ff2fa66b 100644 private void useEigencraftRedstone() { useEigencraftRedstone = this.getBoolean("use-faster-eigencraft-redstone", false); diff --git a/src/main/java/net/minecraft/server/PiglinAI.java b/src/main/java/net/minecraft/server/PiglinAI.java -index 0407fa175..df5aafec9 100644 +index 0407fa1751d89a037da8cb01f5ceef9b9833dd18..df5aafec9a5844a1ae3e948d8a787051a8903bce 100644 --- a/src/main/java/net/minecraft/server/PiglinAI.java +++ b/src/main/java/net/minecraft/server/PiglinAI.java @@ -357,6 +357,7 @@ public class PiglinAI { diff --git a/patches/server/0153-EMC-Configurable-disable-give-dropping.patch b/patches/server/0153-EMC-Configurable-disable-give-dropping.patch index 7fdb1f2b0..54e59b015 100644 --- a/patches/server/0153-EMC-Configurable-disable-give-dropping.patch +++ b/patches/server/0153-EMC-Configurable-disable-give-dropping.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d877477769c7b78cfb817df8c0081f2d646cae68 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 14 Jan 2016 00:49:14 -0500 Subject: [PATCH] EMC - Configurable disable give dropping @@ -8,7 +8,7 @@ purpur.yml to disable the /give command from dropping items on the floor when a player's inventory is full. diff --git a/src/main/java/net/minecraft/server/CommandGive.java b/src/main/java/net/minecraft/server/CommandGive.java -index 1d22c45af..7bf90f27f 100644 +index 1d22c45af884a917e77e02c272fcbae74794200c..7bf90f27fdc48440ef229cca0e100d2c5c0ebef7 100644 --- a/src/main/java/net/minecraft/server/CommandGive.java +++ b/src/main/java/net/minecraft/server/CommandGive.java @@ -35,6 +35,7 @@ public class CommandGive { @@ -20,7 +20,7 @@ index 1d22c45af..7bf90f27f 100644 itemstack.setCount(1); entityitem = entityplayer.drop(itemstack, false); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d01982330..db61ab72e 100644 +index d01982330edcaad92e2f398abe2ae6169a3f7600..db61ab72eeff9db45440773c7185e8ae072cfc55 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -188,6 +188,11 @@ public class PurpurConfig { diff --git a/patches/server/0154-Config-migration-climbing-should-not-bypass-cramming.patch b/patches/server/0154-Config-migration-climbing-should-not-bypass-cramming.patch index 8e5ff762b..5bc5d042c 100644 --- a/patches/server/0154-Config-migration-climbing-should-not-bypass-cramming.patch +++ b/patches/server/0154-Config-migration-climbing-should-not-bypass-cramming.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 0473f0f4334f10fa9c980ab7c9da845c0bf95f9d Mon Sep 17 00:00:00 2001 From: jmp Date: Wed, 2 Dec 2020 14:49:10 -0800 Subject: [PATCH] Config migration: climbing should not bypass cramming @@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: climbing should not bypass cramming diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index db61ab72e..179143400 100644 +index db61ab72eeff9db45440773c7185e8ae072cfc55..17914340051d67b0c3bb80c56b8d3ee4ea772015 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -142,6 +142,17 @@ public class PurpurConfig { @@ -28,7 +28,7 @@ index db61ab72e..179143400 100644 public static String afkBroadcastBack = "§e§o%s is no longer AFK"; public static String afkTabListPrefix = "[AFK] "; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7f40f1187..f57d0e48f 100644 +index 7f40f118723e04491d48227304fb7b1758ed7d0e..f57d0e48fbf8ff54f1a033ccb2302c29038c3a09 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -96,6 +96,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0155-Lobotomize-stuck-villagers.patch b/patches/server/0155-Lobotomize-stuck-villagers.patch index e9245c5df..10ce16a77 100644 --- a/patches/server/0155-Lobotomize-stuck-villagers.patch +++ b/patches/server/0155-Lobotomize-stuck-villagers.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 8a9cceb55210ff833584cc77d080b66144cbb868 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 3 Dec 2020 17:56:18 -0600 Subject: [PATCH] Lobotomize stuck villagers diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 13227c558..330ac6cf8 100644 +index 28c502b5721bd150d9b9d2d84cb07c55af8373f1..98e8f8d7751ca7489c7cb4d41e4f628dec7b5c5d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -114,7 +114,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index 13227c558..330ac6cf8 100644 public float yaw; public float pitch; diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 166a8f9a7..96cfc0c5c 100644 +index 166a8f9a7fe9320f54276445fbfb04059ce18b8c..96cfc0c5c36c6080758b52286afd834257fc5bd7 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -187,15 +187,28 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -59,7 +59,7 @@ index 166a8f9a7..96cfc0c5c 100644 long i = this.bC + 12000L; long j = this.world.getTime(); diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index b92ca4a6d..1208464fb 100644 +index b92ca4a6de01f3f86367fb8dfe3591b08a3e9218..1208464fba96daf276c9cc0c1c9b18db75b03abc 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -101,6 +101,7 @@ public abstract class NavigationAbstract { @@ -71,7 +71,7 @@ index b92ca4a6d..1208464fb 100644 // Paper start - add target parameter return this.a(blockposition, null, i); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f57d0e48f..bd7123842 100644 +index f57d0e48fbf8ff54f1a033ccb2302c29038c3a09..bd7123842ac52e4bf185b12c03226ed50751f2d2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1064,6 +1064,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0156-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0156-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index 214aa0387..8b43a35f7 100644 --- a/patches/server/0156-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0156-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From b6594d1c51e142a9f5b2fb9a804070f3d489fd5e Mon Sep 17 00:00:00 2001 From: jmp Date: Sat, 5 Dec 2020 01:20:16 -0800 Subject: [PATCH] Option for Villager Clerics to farm Nether Wart @@ -8,7 +8,7 @@ farm Nether Wart. Reimplemented based on a feature of the carpet-extra mod. diff --git a/src/main/java/net/minecraft/server/BehaviorFarm.java b/src/main/java/net/minecraft/server/BehaviorFarm.java -index 0ff202c0d..b9c6011c8 100644 +index 0ff202c0d77681f7e0d55d57c69dd0e455336eba..b9c6011c8dcab1a328260871f46d0216bce1818f 100644 --- a/src/main/java/net/minecraft/server/BehaviorFarm.java +++ b/src/main/java/net/minecraft/server/BehaviorFarm.java @@ -12,6 +12,7 @@ public class BehaviorFarm extends Behavior { @@ -88,7 +88,7 @@ index 0ff202c0d..b9c6011c8 100644 if (itemstack.isEmpty()) { inventorysubcontainer.setItem(j, ItemStack.b); diff --git a/src/main/java/net/minecraft/server/BehaviorTradeVillager.java b/src/main/java/net/minecraft/server/BehaviorTradeVillager.java -index ad26ecd7f..6d8b6951c 100644 +index ad26ecd7fe6b6eedc743f2fab687bd0c6a62a46a..6d8b6951c3c07f71dc89131842d815099c62030f 100644 --- a/src/main/java/net/minecraft/server/BehaviorTradeVillager.java +++ b/src/main/java/net/minecraft/server/BehaviorTradeVillager.java @@ -41,6 +41,11 @@ public class BehaviorTradeVillager extends Behavior { @@ -112,7 +112,7 @@ index ad26ecd7f..6d8b6951c 100644 InventorySubcontainer inventorysubcontainer = entityvillager.getInventory(); ItemStack itemstack = ItemStack.b; diff --git a/src/main/java/net/minecraft/server/Behaviors.java b/src/main/java/net/minecraft/server/Behaviors.java -index 2d9186966..e376306bc 100644 +index 2d91869660c36b4cd7bfe887956a26802cce7f8a..e376306bc2555620d1a61af2296f3dd8abc6ce0e 100644 --- a/src/main/java/net/minecraft/server/Behaviors.java +++ b/src/main/java/net/minecraft/server/Behaviors.java @@ -12,10 +12,13 @@ public class Behaviors { @@ -133,7 +133,7 @@ index 2d9186966..e376306bc 100644 } else { object = new BehaviorWork(); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 96cfc0c5c..f0a5708f0 100644 +index 96cfc0c5c36c6080758b52286afd834257fc5bd7..f0a5708f01e49b0cb85230904098d01eaf73a81c 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -131,7 +131,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -170,7 +170,7 @@ index 96cfc0c5c..f0a5708f0 100644 } diff --git a/src/main/java/net/minecraft/server/IInventory.java b/src/main/java/net/minecraft/server/IInventory.java -index 46b88056b..64f1767f6 100644 +index 46b88056b852a7f91d32862dea7bd3a7ea4a1226..64f1767f66a5a91833225faa1b1444e62c6a0205 100644 --- a/src/main/java/net/minecraft/server/IInventory.java +++ b/src/main/java/net/minecraft/server/IInventory.java @@ -31,6 +31,7 @@ public interface IInventory extends Clearable { @@ -190,7 +190,7 @@ index 46b88056b..64f1767f6 100644 for (int i = 0; i < this.getSize(); ++i) { ItemStack itemstack = this.getItem(i); diff --git a/src/main/java/net/minecraft/server/SensorSecondaryPlaces.java b/src/main/java/net/minecraft/server/SensorSecondaryPlaces.java -index 24173f0d3..2d8e3e777 100644 +index 24173f0d3a6c2c9a4a564de6cd828bdef9afec90..2d8e3e77710b59967b7b18006194d73761df6c56 100644 --- a/src/main/java/net/minecraft/server/SensorSecondaryPlaces.java +++ b/src/main/java/net/minecraft/server/SensorSecondaryPlaces.java @@ -12,6 +12,13 @@ public class SensorSecondaryPlaces extends Sensor { @@ -221,7 +221,7 @@ index 24173f0d3..2d8e3e777 100644 behaviorcontroller.removeMemory(MemoryModuleType.SECONDARY_JOB_SITE); } diff --git a/src/main/java/net/minecraft/server/VillagerProfession.java b/src/main/java/net/minecraft/server/VillagerProfession.java -index 3c60da7ac..6493f220a 100644 +index 3c60da7ac6faebe9d964e893974e42613c59b4c1..6493f220a0cf627e82e5f3f3c85e9934d9a9ebae 100644 --- a/src/main/java/net/minecraft/server/VillagerProfession.java +++ b/src/main/java/net/minecraft/server/VillagerProfession.java @@ -9,7 +9,7 @@ public class VillagerProfession { @@ -234,7 +234,7 @@ index 3c60da7ac..6493f220a 100644 public static final VillagerProfession FISHERMAN = a("fisherman", VillagePlaceType.i, SoundEffects.ENTITY_VILLAGER_WORK_FISHERMAN); public static final VillagerProfession FLETCHER = a("fletcher", VillagePlaceType.j, SoundEffects.ENTITY_VILLAGER_WORK_FLETCHER); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index bd7123842..7c740f643 100644 +index bd7123842ac52e4bf185b12c03226ed50751f2d2..7c740f643c3c7459b0071c9d303528aef800334f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1065,6 +1065,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0157-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0157-Toggle-for-Zombified-Piglin-death-always-counting-as.patch index 31234d1f0..4935a234d 100644 --- a/patches/server/0157-Toggle-for-Zombified-Piglin-death-always-counting-as.patch +++ b/patches/server/0157-Toggle-for-Zombified-Piglin-death-always-counting-as.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From c1037da9028a5f62259b39184b7abc83adefb735 Mon Sep 17 00:00:00 2001 From: jmp Date: Sat, 5 Dec 2020 02:34:22 -0800 Subject: [PATCH] Toggle for Zombified Piglin death always counting as player @@ -13,7 +13,7 @@ to the Piglin being angry, even though the player never hit them. This patch adds a toggle to disable this behavior. diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java -index 3327dbbf8..57f3358b8 100644 +index 3327dbbf87d8f43cbc7cd728df2f4c6a33dae40d..57f3358b8dfd53f5b1d2e976d64b809f74bc3ce3 100644 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java @@ -95,7 +95,7 @@ public class EntityPigZombie extends EntityZombie implements IEntityAngerable { @@ -35,7 +35,7 @@ index 3327dbbf8..57f3358b8 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7c740f643..f24e12718 100644 +index 7c740f643c3c7459b0071c9d303528aef800334f..f24e1271878d6bfcccd11fbadfb4578ae62cb722 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1190,12 +1190,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0158-Spread-out-and-optimise-player-list-ticks.patch b/patches/server/0158-Spread-out-and-optimise-player-list-ticks.patch index 050517715..c0704574c 100644 --- a/patches/server/0158-Spread-out-and-optimise-player-list-ticks.patch +++ b/patches/server/0158-Spread-out-and-optimise-player-list-ticks.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From e8adfe66cf4c6d38925656369114d5e240f4e252 Mon Sep 17 00:00:00 2001 From: James Lyne Date: Mon, 7 Dec 2020 17:52:36 +0000 Subject: [PATCH] Spread out and optimise player list ticks diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index eae19141e..881db63d6 100644 +index eae19141e3cc890d3b4bdc0d0297061e79857160..881db63d6f2776956429b969e59db2534f8d96af 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -71,7 +71,7 @@ public abstract class PlayerList { @@ -56,7 +56,7 @@ index eae19141e..881db63d6 100644 public void sendAll(Packet packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e781ae267..4f42bc218 100644 +index e781ae267d4c546261a1dcdfc24d9924eb5044fd..4f42bc21839086b2a40a35910a08d9b11c7649f9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1382,7 +1382,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0159-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0159-Configurable-chance-for-wolves-to-spawn-rabid.patch index abe02adc4..4b9ddf6ca 100644 --- a/patches/server/0159-Configurable-chance-for-wolves-to-spawn-rabid.patch +++ b/patches/server/0159-Configurable-chance-for-wolves-to-spawn-rabid.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From c39c8be799cfaeb5c347130e86a796cc4b6695d4 Mon Sep 17 00:00:00 2001 From: Encode42 Date: Tue, 8 Dec 2020 17:15:15 -0500 Subject: [PATCH] Configurable chance for wolves to spawn rabid @@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid. Rabid wolves attack all players, mobs, and animals. diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f730fa484..e3ac6ebfd 100644 +index f730fa484b770eb41ce1fe4f7765b77866472798..e3ac6ebfd488e8ee94eb47c224e53f05eff9c563 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2085,6 +2085,7 @@ public abstract class EntityLiving extends Entity { @@ -19,7 +19,7 @@ index f730fa484..e3ac6ebfd 100644 if (enumhand == EnumHand.MAIN_HAND) { this.setSlot(EnumItemSlot.MAINHAND, itemstack); diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index 6c25f667e..5fe2e9f4b 100644 +index 6c25f667eecdf345289a0dbf885c9d71c6a26958..5fe2e9f4bfbdc08690eacd6196e59529dc7953e8 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -14,11 +14,42 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable @@ -174,7 +174,7 @@ index 6c25f667e..5fe2e9f4b 100644 return super.b(entityhuman, enumhand); } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java -index 9a4819815..da2989857 100644 +index 9a4819815c7a4bf2fd4a92c4169ace35f2261704..da29898574d30d5fecc5a44ad7b365564fa686e1 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java @@ -8,7 +8,7 @@ public class PathfinderGoalAvoidTarget extends Pathfinde @@ -201,7 +201,7 @@ index 9a4819815..da2989857 100644 public PathfinderGoalAvoidTarget(EntityCreature entitycreature, Class oclass, Predicate predicate, float f, double d0, double d1, Predicate predicate1) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f24e12718..417a4b364 100644 +index f24e1271878d6bfcccd11fbadfb4578ae62cb722..417a4b3645713afa165a917416efa7478c9082a0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1141,10 +1141,14 @@ public class PurpurWorldConfig { @@ -220,7 +220,7 @@ index f24e12718..417a4b364 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java -index 5f3314feb..507857ba2 100644 +index 5f3314febb2300a9b4f3a7c143cb65811e1d5320..507857ba247d0988e0011d215ea38a3622e78e05 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java @@ -45,4 +45,16 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf { diff --git a/patches/server/0160-Configurable-default-wolf-collar-color.patch b/patches/server/0160-Configurable-default-wolf-collar-color.patch index 34f17c5da..3e4713a3e 100644 --- a/patches/server/0160-Configurable-default-wolf-collar-color.patch +++ b/patches/server/0160-Configurable-default-wolf-collar-color.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d932f8d47ba0b2961e0c1be0856e0e85695f7f6f Mon Sep 17 00:00:00 2001 From: Encode42 Date: Thu, 10 Dec 2020 13:43:28 -0500 Subject: [PATCH] Configurable default wolf collar color @@ -7,7 +7,7 @@ This allows for the server to set a default collar color when a wolf is tamed. Resets to RED when the value is invalid. diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index b28f1a374..0d179f3d3 100644 +index 5fe2e9f4bfbdc08690eacd6196e59529dc7953e8..fd62dc51258876275adbe02f750fd88107c38a6b 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -115,6 +115,12 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable @@ -24,7 +24,7 @@ index b28f1a374..0d179f3d3 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 417a4b364..26ce1e69a 100644 +index 417a4b3645713afa165a917416efa7478c9082a0..26ce1e69a9529aa1741d2ec6aa5dc13c21f58218 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -3,6 +3,7 @@ package net.pl3x.purpur; diff --git a/patches/server/0161-Configurable-entity-base-attributes.patch b/patches/server/0161-Configurable-entity-base-attributes.patch index 06e6c5c9c..ae609f46c 100644 --- a/patches/server/0161-Configurable-entity-base-attributes.patch +++ b/patches/server/0161-Configurable-entity-base-attributes.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a7c4ee55458c70360e974f658b370b00d0124017 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 10 Dec 2020 16:44:54 -0600 Subject: [PATCH] Configurable entity base attributes diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java -index bdf4e798a..65313c267 100644 +index bdf4e798ac8ca27edebd0122b894d15a76ecb9d0..65313c2678b1ca480951c5ce4c9799e5e7b6d4eb 100644 --- a/src/main/java/net/minecraft/server/EntityBat.java +++ b/src/main/java/net/minecraft/server/EntityBat.java @@ -54,6 +54,14 @@ public class EntityBat extends EntityAmbient { @@ -24,7 +24,7 @@ index bdf4e798a..65313c267 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index ded4e10f5..5ea6430ae 100644 +index ded4e10f5082fb5aa25368d9035affba287c3345..5ea6430ae5cbbdf7972f5addccd96554ba8412e8 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -105,6 +105,14 @@ public class EntityBee extends EntityAnimal implements IEntityAngerable, EntityB @@ -43,7 +43,7 @@ index ded4e10f5..5ea6430ae 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java -index dcfad16e0..ec4a790e4 100644 +index dcfad16e06450068d5801fc002c9650102dbf995..ec4a790e48e7df3e36558f2ba49ae00b8b3af7f8 100644 --- a/src/main/java/net/minecraft/server/EntityBlaze.java +++ b/src/main/java/net/minecraft/server/EntityBlaze.java @@ -45,6 +45,14 @@ public class EntityBlaze extends EntityMonster { @@ -62,7 +62,7 @@ index dcfad16e0..ec4a790e4 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index a6ce4ca27..a30e6a456 100644 +index a6ce4ca27c9670655a8f66bfc624f12659613379..a30e6a456ce6fe4af58a1995bcd919b6010579dc 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -63,6 +63,14 @@ public class EntityCat extends EntityTameableAnimal { @@ -81,7 +81,7 @@ index a6ce4ca27..a30e6a456 100644 public MinecraftKey eU() { diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java -index 2e1f2dec1..75a6ca346 100644 +index 2e1f2dec17e7761b6534f29bbec813d135250e4f..75a6ca3469d9529eabf5b5f62f242d00aada2b85 100644 --- a/src/main/java/net/minecraft/server/EntityCaveSpider.java +++ b/src/main/java/net/minecraft/server/EntityCaveSpider.java @@ -18,6 +18,14 @@ public class EntityCaveSpider extends EntitySpider { @@ -100,7 +100,7 @@ index 2e1f2dec1..75a6ca346 100644 public static AttributeProvider.Builder m() { diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java -index 26f783349..23c9bb43e 100644 +index 26f7833496ceaf5c6f67ac7fb276e1f82e51de07..23c9bb43ee4bcd5ad1bc8fe26a7143ebd76532bb 100644 --- a/src/main/java/net/minecraft/server/EntityChicken.java +++ b/src/main/java/net/minecraft/server/EntityChicken.java @@ -34,6 +34,8 @@ public class EntityChicken extends EntityAnimal { @@ -113,7 +113,7 @@ index 26f783349..23c9bb43e 100644 } diff --git a/src/main/java/net/minecraft/server/EntityCod.java b/src/main/java/net/minecraft/server/EntityCod.java -index 039fae4c2..2cf4faff8 100644 +index 039fae4c29648afa85ea1b27d82cfe51c4165315..2cf4faff8274556e7a377fe3ea193f93e9af54de 100644 --- a/src/main/java/net/minecraft/server/EntityCod.java +++ b/src/main/java/net/minecraft/server/EntityCod.java @@ -16,6 +16,14 @@ public class EntityCod extends EntityFishSchool { @@ -132,7 +132,7 @@ index 039fae4c2..2cf4faff8 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 63497ca02..5924886db 100644 +index 63497ca0266073dc0a16b7dc22641d08c3eaf400..5924886db49a39206b9814f951798f119a7f41d7 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -26,6 +26,14 @@ public class EntityCow extends EntityAnimal { @@ -151,7 +151,7 @@ index 63497ca02..5924886db 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index d186f257f..a2448718d 100644 +index d186f257fa3bc613be7ec79cd6a6ff2e747cba78..a2448718de61fc3762af69de5ee35cf1a507fcac 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -96,6 +96,14 @@ public class EntityCreeper extends EntityMonster { @@ -170,7 +170,7 @@ index d186f257f..a2448718d 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java -index 9d5d143a9..ff8f4ddfb 100644 +index 9d5d143a997b74e0777bb79bf14d341ad5340db9..ff8f4ddfb160ed338c4378d0145bf8696c915dee 100644 --- a/src/main/java/net/minecraft/server/EntityDolphin.java +++ b/src/main/java/net/minecraft/server/EntityDolphin.java @@ -63,6 +63,14 @@ public class EntityDolphin extends EntityWaterAnimal { @@ -189,7 +189,7 @@ index 9d5d143a9..ff8f4ddfb 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 638efc67d..816c15650 100644 +index 638efc67d66001ee085957d4698f51a7daac77fc..816c15650561f981522777a9113df448e01a8f15 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -46,6 +46,14 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -208,7 +208,7 @@ index 638efc67d..816c15650 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 17a9217ed..fd1e966d1 100644 +index 17a9217ed2d1677371d12b4ab0552378cd71652f..fd1e966d1a50837daa68d8a6c43897355996ae1a 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -97,6 +97,14 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -227,7 +227,7 @@ index 17a9217ed..fd1e966d1 100644 public static AttributeProvider.Builder m() { diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index acb2b3ed0..cf3a607ac 100644 +index acb2b3ed04ea0bf19335415310ce22cd076dd92a..cf3a607ace5965e5d9324a9163c7c34b8996be7e 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -40,6 +40,14 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { @@ -246,7 +246,7 @@ index acb2b3ed0..cf3a607ac 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java -index 7eef7f523..389ed1cc1 100644 +index 7eef7f523a17434b38492006526920a955fc9120..389ed1cc1b3547f470071cdde8088af57b49f121 100644 --- a/src/main/java/net/minecraft/server/EntityEndermite.java +++ b/src/main/java/net/minecraft/server/EntityEndermite.java @@ -22,6 +22,14 @@ public class EntityEndermite extends EntityMonster { @@ -265,7 +265,7 @@ index 7eef7f523..389ed1cc1 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java -index c75dc7561..194ed8fc1 100644 +index c75dc75611991028e9de6db7c57304e913251a6b..194ed8fc149c96833a88bfdca4e42618c125168f 100644 --- a/src/main/java/net/minecraft/server/EntityEvoker.java +++ b/src/main/java/net/minecraft/server/EntityEvoker.java @@ -22,6 +22,14 @@ public class EntityEvoker extends EntityIllagerWizard { @@ -284,7 +284,7 @@ index c75dc7561..194ed8fc1 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index e87f5aeb9..2f924721f 100644 +index e87f5aeb97fc35ff2b3464f31a2ec18432774cd4..2f924721fc1b8937de92b7188bd7fd3cc689f457 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -91,6 +91,14 @@ public class EntityFox extends EntityAnimal { @@ -303,7 +303,7 @@ index e87f5aeb9..2f924721f 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java -index 216506a7b..a6a0d1ffe 100644 +index 216506a7b1f97b776ecd4e24f5b2afaf5b79ec2d..a6a0d1ffe6a0cf5e01a6a0145e5bb866365e032d 100644 --- a/src/main/java/net/minecraft/server/EntityGhast.java +++ b/src/main/java/net/minecraft/server/EntityGhast.java @@ -41,6 +41,14 @@ public class EntityGhast extends EntityFlying implements IMonster { @@ -322,7 +322,7 @@ index 216506a7b..a6a0d1ffe 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java -index 0a7f51a2a..01a49898a 100644 +index 0a7f51a2a1cb10438c9364faf3e4adc6322fc787..01a49898a0f4a8d0813784697002b657cdbd245a 100644 --- a/src/main/java/net/minecraft/server/EntityGuardian.java +++ b/src/main/java/net/minecraft/server/EntityGuardian.java @@ -46,6 +46,14 @@ public class EntityGuardian extends EntityMonster { @@ -341,7 +341,7 @@ index 0a7f51a2a..01a49898a 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityGuardianElder.java b/src/main/java/net/minecraft/server/EntityGuardianElder.java -index f6f882746..07f6baebb 100644 +index f6f882746940c9e049106aa9b41591ba27a608ce..07f6baebb65682fe27deaecad12c66bd38014ab1 100644 --- a/src/main/java/net/minecraft/server/EntityGuardianElder.java +++ b/src/main/java/net/minecraft/server/EntityGuardianElder.java @@ -26,6 +26,14 @@ public class EntityGuardianElder extends EntityGuardian { @@ -360,7 +360,7 @@ index f6f882746..07f6baebb 100644 public static AttributeProvider.Builder m() { diff --git a/src/main/java/net/minecraft/server/EntityHoglin.java b/src/main/java/net/minecraft/server/EntityHoglin.java -index a1578aade..2fa388776 100644 +index a1578aade4a535144b5e40277c902f2e9ab9e940..2fa388776e68f6f0d4d985a451a0a2b05de499fe 100644 --- a/src/main/java/net/minecraft/server/EntityHoglin.java +++ b/src/main/java/net/minecraft/server/EntityHoglin.java @@ -35,6 +35,14 @@ public class EntityHoglin extends EntityAnimal implements IMonster, IOglin { @@ -379,7 +379,7 @@ index a1578aade..2fa388776 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java -index b19995f96..0225f57f9 100644 +index b19995f962180a44ff388d58a26cc5782d0826e4..0225f57f9d99c53f47a1a086415f9235803c9c9e 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java @@ -22,6 +22,14 @@ public class EntityHorse extends EntityHorseAbstract { @@ -398,7 +398,7 @@ index b19995f96..0225f57f9 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index bb3ebf70f..049f73b50 100644 +index bb3ebf70f460c459defda833d6f40026321ad638..049f73b509974d9c7528e1126db325dca83c54b3 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -863,6 +863,16 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -419,7 +419,7 @@ index bb3ebf70f..049f73b50 100644 return 15.0F + (float) this.random.nextInt(8) + (float) this.random.nextInt(9); } diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java -index f6421bb45..44a9cc76d 100644 +index f6421bb45c5e6adf39fdc085efe2b2f500b76c0c..44a9cc76d999341373c38e551ee2d58bb5a12458 100644 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java @@ -18,6 +18,14 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract { @@ -438,7 +438,7 @@ index f6421bb45..44a9cc76d 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHorseMule.java b/src/main/java/net/minecraft/server/EntityHorseMule.java -index 30cbc505d..d57ed7a96 100644 +index 30cbc505d2b0f4d3247edfd271de8daab023eb2a..d57ed7a9691b953abba5f6db934ce11bdc4a6ff9 100644 --- a/src/main/java/net/minecraft/server/EntityHorseMule.java +++ b/src/main/java/net/minecraft/server/EntityHorseMule.java @@ -18,7 +18,16 @@ public class EntityHorseMule extends EntityHorseChestedAbstract { @@ -459,7 +459,7 @@ index 30cbc505d..d57ed7a96 100644 protected SoundEffect getSoundAmbient() { super.getSoundAmbient(); diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index 408db52ca..b4d01a17a 100644 +index 408db52cacbdfbca8af0a6a8e913b0128a3f5a76..b4d01a17a34e371231efbaa64732d060ccdd6409 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -27,6 +27,14 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -478,7 +478,7 @@ index 408db52ca..b4d01a17a 100644 public static AttributeProvider.Builder eL() { diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java -index 2121a6c97..5a89a37e7 100644 +index 2121a6c979ba2ea7cb596ca6081750d2f8c7df9f..5a89a37e78c174d54c0dabe242252bcf3fd76d5f 100644 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java @@ -23,6 +23,14 @@ public class EntityHorseZombie extends EntityHorseAbstract { @@ -497,7 +497,7 @@ index 2121a6c97..5a89a37e7 100644 public static AttributeProvider.Builder eL() { diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java -index 9ee03b233..de4a4f4d6 100644 +index 9ee03b233b71d1b4b85a9a5e1f0ea9feb55dfe43..de4a4f4d6a025de5461fcaa68a455d3d47352370 100644 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java @@ -32,6 +32,14 @@ public class EntityIronGolem extends EntityGolem implements IEntityAngerable { @@ -516,7 +516,7 @@ index 9ee03b233..de4a4f4d6 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index 3bc6e6df9..1f85da762 100644 +index 3bc6e6df9e0107debe5b15f5f7aad97ad336f304..1f85da762f90486685359acf97c7c9627c317ef4 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -62,6 +62,14 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -535,7 +535,7 @@ index 3bc6e6df9..1f85da762 100644 public void setStrength(int i) { diff --git a/src/main/java/net/minecraft/server/EntityLlamaTrader.java b/src/main/java/net/minecraft/server/EntityLlamaTrader.java -index b6aae5cde..592c3cbcf 100644 +index b6aae5cdee1f8bb842ab8e06c47fb497576b464f..592c3cbcf8e19ea556d014e15cf5b3c0b8ce49a5 100644 --- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java +++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java @@ -26,6 +26,14 @@ public class EntityLlamaTrader extends EntityLlama { @@ -554,7 +554,7 @@ index b6aae5cde..592c3cbcf 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityMagmaCube.java b/src/main/java/net/minecraft/server/EntityMagmaCube.java -index cd28463e2..df8f1ee0f 100644 +index cd28463e2bf944d94c121c8f8d6e37221754c168..df8f1ee0f2ff1371ace8d54bdb952da41746848d 100644 --- a/src/main/java/net/minecraft/server/EntityMagmaCube.java +++ b/src/main/java/net/minecraft/server/EntityMagmaCube.java @@ -23,6 +23,18 @@ public class EntityMagmaCube extends EntitySlime { @@ -577,7 +577,7 @@ index cd28463e2..df8f1ee0f 100644 public static AttributeProvider.Builder m() { diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index eb1f95d8b..aea40b479 100644 +index eb1f95d8bae4bc2580849614ba879dd1a8792ecb..aea40b479b3e667447ad13526dc288ad1e0a8c0d 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -35,6 +35,14 @@ public class EntityMushroomCow extends EntityCow implements IShearable { @@ -596,7 +596,7 @@ index eb1f95d8b..aea40b479 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index a5be10dfb..2ff3472ac 100644 +index a5be10dfb0de08b0d97265278b1f11ad1e94b821..2ff3472ac8c19b55bc216d1965cacbb7d26e173d 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -31,6 +31,14 @@ public class EntityOcelot extends EntityAnimal { @@ -615,7 +615,7 @@ index a5be10dfb..2ff3472ac 100644 private boolean isTrusting() { diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java -index c70180fdd..3f09d2068 100644 +index c70180fddb829419b9cc5188766e9130f9b8a94a..3f09d20683383dad32ae58000657ee10a6f49355 100644 --- a/src/main/java/net/minecraft/server/EntityPanda.java +++ b/src/main/java/net/minecraft/server/EntityPanda.java @@ -70,6 +70,15 @@ public class EntityPanda extends EntityAnimal { @@ -650,7 +650,7 @@ index c70180fdd..3f09d2068 100644 if (this.isLazy()) { diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java -index 398e92bf7..256129844 100644 +index 398e92bf7053c411bd98626efe4261e15256d3ee..2561298446d3a797da31a3de3955fb5ec904e8f0 100644 --- a/src/main/java/net/minecraft/server/EntityParrot.java +++ b/src/main/java/net/minecraft/server/EntityParrot.java @@ -120,6 +120,14 @@ public class EntityParrot extends EntityPerchable implements EntityBird { @@ -669,7 +669,7 @@ index 398e92bf7..256129844 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index f8c348004..889e388cf 100644 +index f8c3480045e86a18501db223c1b2254cf3298a42..889e388cf13ba0a385ee88a3acd0b813c0776dee 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -75,6 +75,14 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -688,7 +688,7 @@ index f8c348004..889e388cf 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 7172e8cab..5152a5e40 100644 +index 7172e8cabf5b715ae9a1087b0d11e6cee81ea6e4..5152a5e4027c36e0326b86776f3331dd61bc16ad 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -34,6 +34,14 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable { @@ -707,7 +707,7 @@ index 7172e8cab..5152a5e40 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java -index 57f3358b8..a00e56d1f 100644 +index 57f3358b8dfd53f5b1d2e976d64b809f74bc3ce3..a00e56d1fc78f012751a0913dcc221b7a8f3a019 100644 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java @@ -46,6 +46,14 @@ public class EntityPigZombie extends EntityZombie implements IEntityAngerable { @@ -726,7 +726,7 @@ index 57f3358b8..a00e56d1f 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPiglin.java b/src/main/java/net/minecraft/server/EntityPiglin.java -index 334e0f73e..16208564e 100644 +index 334e0f73e67ef2db7e680874faf0646995d9de8a..16208564e8316cfe8670dcd59624b8b33883ddb6 100644 --- a/src/main/java/net/minecraft/server/EntityPiglin.java +++ b/src/main/java/net/minecraft/server/EntityPiglin.java @@ -35,6 +35,14 @@ public class EntityPiglin extends EntityPiglinAbstract implements ICrossbow { @@ -745,7 +745,7 @@ index 334e0f73e..16208564e 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPiglinBrute.java b/src/main/java/net/minecraft/server/EntityPiglinBrute.java -index f6b170811..b9e965661 100644 +index f6b170811159544dc10b91226e4e54b349472c46..b9e965661a869c0b3261c1abb80ced8fbe3bb3d9 100644 --- a/src/main/java/net/minecraft/server/EntityPiglinBrute.java +++ b/src/main/java/net/minecraft/server/EntityPiglinBrute.java @@ -25,6 +25,14 @@ public class EntityPiglinBrute extends EntityPiglinAbstract { @@ -764,7 +764,7 @@ index f6b170811..b9e965661 100644 public static AttributeProvider.Builder eS() { diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java -index cf7de0127..7c19f0a00 100644 +index cf7de0127166f6175a6246062c8664e64959edeb..7c19f0a00a0feb0a412ca0d340ef7194bb212314 100644 --- a/src/main/java/net/minecraft/server/EntityPillager.java +++ b/src/main/java/net/minecraft/server/EntityPillager.java @@ -23,6 +23,14 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow { @@ -783,7 +783,7 @@ index cf7de0127..7c19f0a00 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java -index 40395dd7e..9c72c8f46 100644 +index 40395dd7ea515e51a189d014a3274d15dc1d8ee6..9c72c8f46fe2252239bcd4de078cc9694f2c78de 100644 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java @@ -72,6 +72,14 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable { @@ -802,7 +802,7 @@ index 40395dd7e..9c72c8f46 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java -index 16a4df27c..8c8a4b0d0 100644 +index 16a4df27c557e2d4a0fd4f48317307b884c2688c..8c8a4b0d09380e773a35ec0b91001a99bb7416a9 100644 --- a/src/main/java/net/minecraft/server/EntityPufferFish.java +++ b/src/main/java/net/minecraft/server/EntityPufferFish.java @@ -27,6 +27,14 @@ public class EntityPufferFish extends EntityFish { @@ -821,7 +821,7 @@ index 16a4df27c..8c8a4b0d0 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index 654cd036a..d13ad3e77 100644 +index 654cd036a8e4aa4499f10f528b684e003c469c9a..d13ad3e7796b8fc110b187cd0ebe95467c05f8c5 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -35,6 +35,14 @@ public class EntityRabbit extends EntityAnimal { @@ -840,7 +840,7 @@ index 654cd036a..d13ad3e77 100644 // CraftBukkit start - code from constructor diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java -index a90214588..787b39b8b 100644 +index a9021458814d84a3a82088f91956db73562c3b10..787b39b8b84a58aa909983092a59fe6c58cca965 100644 --- a/src/main/java/net/minecraft/server/EntityRavager.java +++ b/src/main/java/net/minecraft/server/EntityRavager.java @@ -39,6 +39,14 @@ public class EntityRavager extends EntityRaider { @@ -859,7 +859,7 @@ index a90214588..787b39b8b 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java -index 6dfcee2c9..67635a40b 100644 +index 6dfcee2c9b658c2c9ee1179e412389934c066d48..67635a40b243c7b9ea4b04d30d92b3a8ea611c5f 100644 --- a/src/main/java/net/minecraft/server/EntitySalmon.java +++ b/src/main/java/net/minecraft/server/EntitySalmon.java @@ -16,6 +16,14 @@ public class EntitySalmon extends EntityFishSchool { @@ -878,7 +878,7 @@ index 6dfcee2c9..67635a40b 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java -index 32130c068..6593d171f 100644 +index 32130c0681501e3e5a47b199f0bb39daac416ed3..6593d171fe99141843c817f3c926b59c8df37ae4 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -71,6 +71,14 @@ public class EntitySheep extends EntityAnimal implements IShearable { @@ -897,7 +897,7 @@ index 32130c068..6593d171f 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java -index 30e0e1416..5c0e95a46 100644 +index 30e0e14162cce0c0d228139d4c537243a400ef13..5c0e95a460cec4d146d91564fe9a7af34aa82f30 100644 --- a/src/main/java/net/minecraft/server/EntityShulker.java +++ b/src/main/java/net/minecraft/server/EntityShulker.java @@ -39,6 +39,14 @@ public class EntityShulker extends EntityGolem implements IMonster { @@ -916,7 +916,7 @@ index 30e0e1416..5c0e95a46 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java -index ad428e090..dfbd0bff3 100644 +index ad428e090089a461283445022b33313520585ac5..dfbd0bff32cf09f0737e272daeb6de6015276620 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -21,6 +21,14 @@ public class EntitySilverfish extends EntityMonster { @@ -935,7 +935,7 @@ index ad428e090..dfbd0bff3 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java -index 3f130e03b..a1fddbdf1 100644 +index 3f130e03bf8b235360385fd169d4886ffcfa626a..a1fddbdf1a7fbd27732f0457dfdbf2edab76210e 100644 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java @@ -16,6 +16,14 @@ public class EntitySkeleton extends EntitySkeletonAbstract { @@ -954,7 +954,7 @@ index 3f130e03b..a1fddbdf1 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java -index d123fb82b..bd807058b 100644 +index d123fb82b635d5271bea9b238554a3011858eeae..bd807058b1607e3086430f651c2095c9c9d8dbaf 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java @@ -18,6 +18,14 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract { @@ -973,7 +973,7 @@ index d123fb82b..bd807058b 100644 public static boolean a(EntityTypes entitytypes, WorldAccess worldaccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) { diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java -index 96cb080d9..aea8a191c 100644 +index 96cb080d940db22330598a8806726088b79a53c1..aea8a191c07939ea0e21725ba0bbf0538064f27e 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java @@ -19,6 +19,14 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract { @@ -992,7 +992,7 @@ index 96cb080d9..aea8a191c 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 460263629..12acdc284 100644 +index 46026362981ce8a3a9e7d63e16230b5425a5d388..12acdc2840ac1db5a8f1facf4350aa42e369eda1 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -10,6 +10,7 @@ import com.destroystokyo.paper.event.entity.SlimeChangeDirectionEvent; @@ -1050,7 +1050,7 @@ index 460263629..12acdc284 100644 this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue((double) i); if (flag) { diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index e5b3d298f..c773c3a9f 100644 +index e5b3d298f52006f39a36cfdd95097e7b4f89939a..c773c3a9f8ba60d376ca3d321d3d639fba7aa033 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java @@ -24,6 +24,14 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt @@ -1069,7 +1069,7 @@ index e5b3d298f..c773c3a9f 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java -index 92d741378..541b31521 100644 +index 92d74137877d096970bf9d1b4fc91beabb862b9d..541b3152101f30cf6283a102b2feee8fbbf31668 100644 --- a/src/main/java/net/minecraft/server/EntitySpider.java +++ b/src/main/java/net/minecraft/server/EntitySpider.java @@ -21,6 +21,14 @@ public class EntitySpider extends EntityMonster { @@ -1088,7 +1088,7 @@ index 92d741378..541b31521 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index cee226501..d25e28692 100644 +index cee226501690e1c00983a01ac82bc7384f233c3c..d25e28692be688546fbcedb5acdf36e2aed8aec7 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -56,6 +56,14 @@ public class EntitySquid extends EntityWaterAnimal { @@ -1107,7 +1107,7 @@ index cee226501..d25e28692 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityStrider.java b/src/main/java/net/minecraft/server/EntityStrider.java -index 9ab1b5af6..1bb33c416 100644 +index 9ab1b5af68774fa4d4da89195fdb91172370d43d..1bb33c4169902cf6eb323f79a5d98a1df5726d96 100644 --- a/src/main/java/net/minecraft/server/EntityStrider.java +++ b/src/main/java/net/minecraft/server/EntityStrider.java @@ -43,6 +43,14 @@ public class EntityStrider extends EntityAnimal implements ISteerable, ISaddleab @@ -1126,7 +1126,7 @@ index 9ab1b5af6..1bb33c416 100644 public static boolean c(EntityTypes entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) { diff --git a/src/main/java/net/minecraft/server/EntityTropicalFish.java b/src/main/java/net/minecraft/server/EntityTropicalFish.java -index 2c9df356e..e52408c5f 100644 +index 2c9df356e685ea6f71653023fadcf7e287dcd46e..e52408c5f115d80e91fbde7c73ed308610d02d9d 100644 --- a/src/main/java/net/minecraft/server/EntityTropicalFish.java +++ b/src/main/java/net/minecraft/server/EntityTropicalFish.java @@ -29,6 +29,14 @@ public class EntityTropicalFish extends EntityFishSchool { @@ -1145,7 +1145,7 @@ index 2c9df356e..e52408c5f 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index 067f7f28b..dbbf213a4 100644 +index 067f7f28b02b388d56b93b1ed8274799757196e6..dbbf213a46bf71541dd666be251a01942143e327 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -42,6 +42,14 @@ public class EntityTurtle extends EntityAnimal { @@ -1164,7 +1164,7 @@ index 067f7f28b..dbbf213a4 100644 public void setHomePos(BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index ac75ed3e2..6870d175c 100644 +index ac75ed3e2e0e0cd8f91de9ff188e173591443b72..6870d175c714d7870072cd1e9825d8e9d8a1588a 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -56,6 +56,14 @@ public class EntityVex extends EntityMonster { @@ -1183,7 +1183,7 @@ index ac75ed3e2..6870d175c 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index f0a5708f0..00504af85 100644 +index f0a5708f01e49b0cb85230904098d01eaf73a81c..00504af85276f504b5334c881ad6df0702adc959 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -95,6 +95,14 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -1202,7 +1202,7 @@ index f0a5708f0..00504af85 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java -index 3ea66955d..63b888716 100644 +index 3ea66955df304fd13aac2cf9bb93ea156558ae57..63b88871674f7d25f9dc30f6949cd82382ed9129 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java @@ -63,6 +63,14 @@ public class EntityVillagerTrader extends EntityVillagerAbstract { @@ -1221,7 +1221,7 @@ index 3ea66955d..63b888716 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index 9950bda50..3c906f423 100644 +index 9950bda50f405ce44f8fc8d95682e2522cf9e10f..3c906f42379352026187b4c32a5d3574e3a299f3 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -27,6 +27,14 @@ public class EntityVindicator extends EntityIllagerAbstract { @@ -1240,7 +1240,7 @@ index 9950bda50..3c906f423 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 323d79a99..1809f2ba3 100644 +index 323d79a99402b0f6952b4fb873170069f3428953..1809f2ba3f4e676395768c7da71e8917f2f241eb 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -34,6 +34,14 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -1259,7 +1259,7 @@ index 323d79a99..1809f2ba3 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index 0d179f3d3..fa68a0feb 100644 +index fd62dc51258876275adbe02f750fd88107c38a6b..9407ca671638a46bac8f1ee912d26a865751d7b0 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -121,6 +121,14 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable @@ -1278,7 +1278,7 @@ index 0d179f3d3..fa68a0feb 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityZoglin.java b/src/main/java/net/minecraft/server/EntityZoglin.java -index d92fe8013..067c99f13 100644 +index d92fe8013fb3b43cb7eabdf1c624291b7e881889..067c99f13f2c016b1f753b3eeeda5927007bbf94 100644 --- a/src/main/java/net/minecraft/server/EntityZoglin.java +++ b/src/main/java/net/minecraft/server/EntityZoglin.java @@ -31,6 +31,14 @@ public class EntityZoglin extends EntityMonster implements IMonster, IOglin { @@ -1297,7 +1297,7 @@ index d92fe8013..067c99f13 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 3ad8bd084..23c1a6e69 100644 +index 3ad8bd0847aacabf90e83c00cd7c1a8f51aaa2e4..23c1a6e69e7121f9d831d6dab0356b9679184d98 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -67,6 +67,14 @@ public class EntityZombie extends EntityMonster { @@ -1316,7 +1316,7 @@ index 3ad8bd084..23c1a6e69 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java -index 02b0ae550..f22419837 100644 +index 02b0ae550a0ed33b5b43beedf3b1405985c58c13..f22419837d5be8277716fc294b0192e7480c58ba 100644 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java @@ -33,6 +33,14 @@ public class EntityZombieHusk extends EntityZombie { @@ -1335,7 +1335,7 @@ index 02b0ae550..f22419837 100644 public static boolean a(EntityTypes entitytypes, WorldAccess worldaccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) { diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 0c47477b4..d6352539a 100644 +index 0c47477b416980d2e932321730525bf5a8feda4f..d6352539a5639db84f5654ba808f74ba3954dc0c 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -53,6 +53,14 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo @@ -1354,7 +1354,7 @@ index 0c47477b4..d6352539a 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 26ce1e69a..7e3c97347 100644 +index 26ce1e69a9529aa1741d2ec6aa5dc13c21f58218..7e3c97347b44549059890b611a79c3ede6cf947d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -473,30 +473,36 @@ public class PurpurWorldConfig { diff --git a/patches/server/0162-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0162-Fix-CraftSound-backwards-compatibility.patch index 92c960c15..0185bcb37 100644 --- a/patches/server/0162-Fix-CraftSound-backwards-compatibility.patch +++ b/patches/server/0162-Fix-CraftSound-backwards-compatibility.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 6f51a9df34fccd246718707b689b68b7a8e3285a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 10 Dec 2020 21:41:24 -0600 Subject: [PATCH] Fix CraftSound backwards compatibility diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java -index a7137123f..c45fd46c1 100644 +index a7137123f698929263d342d5f8da1b34be3c9d5e..c45fd46c11c1b544daa07da9bba4179050bf6785 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java @@ -27,4 +27,10 @@ public class CraftSound { diff --git a/patches/server/0163-Phantom-flames-on-swoop.patch b/patches/server/0163-Phantom-flames-on-swoop.patch index 45abe54df..d1cad3fec 100644 --- a/patches/server/0163-Phantom-flames-on-swoop.patch +++ b/patches/server/0163-Phantom-flames-on-swoop.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From e086545ea2149321bbe35795b3f9d97115716ec6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 12 Dec 2020 09:10:59 -0600 Subject: [PATCH] Phantom flames on swoop diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 889e388cf..d6509eef1 100644 +index 889e388cf13ba0a385ee88a3acd0b813c0776dee..d6509eef1dc26beafc752c8518eabfeccb02653b 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -184,6 +184,7 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -17,7 +17,7 @@ index 889e388cf..d6509eef1 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7e3c97347..8664315de 100644 +index 7e3c97347b44549059890b611a79c3ede6cf947d..8664315deb60468d946857f1b70afd8b9bcb56b0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -910,6 +910,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0164-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0164-Option-for-chests-to-open-even-with-a-solid-block-on.patch index 7768cec00..dfbf26566 100644 --- a/patches/server/0164-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0164-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 8c54a126346a7b9ccdb31e551795a8acf76dca9f Mon Sep 17 00:00:00 2001 From: jmp Date: Sat, 12 Dec 2020 14:34:18 -0800 Subject: [PATCH] Option for chests to open even with a solid block on top diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index 9e5e6de52..487b281cf 100644 +index 9e5e6de52efabe9126f6c47acb35fa1dc461ff4f..487b281cf53d3482853d56ee1e90a329d516395f 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -262,6 +262,7 @@ public class BlockChest extends BlockChestAbstract implements I @@ -17,7 +17,7 @@ index 9e5e6de52..487b281cf 100644 return iblockaccess.getType(blockposition1).isOccluding(iblockaccess, blockposition1); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8664315de..22d1eae89 100644 +index 8664315deb60468d946857f1b70afd8b9bcb56b0..22d1eae897baf8988807eb6b72e3d8a324c173f7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -370,6 +370,11 @@ public class PurpurWorldConfig { diff --git a/scripts/rebuildpatches.sh b/scripts/rebuildpatches.sh index 166dc18ad..ad2f58749 100755 --- a/scripts/rebuildpatches.sh +++ b/scripts/rebuildpatches.sh @@ -30,10 +30,9 @@ function savePatches() { rm "$basedir"/patches/"$2"/*.patch fi - git format-patch --no-signature --zero-commit --no-stat -N -o "$basedir"/patches/"$2" upstream/upstream + git format-patch --no-signature --no-stat --full-index -N -o "$basedir/patches/$2" upstream/upstream cd "$basedir" || exit git add -A "$basedir"/patches/"$2" - cleanupPatches "$basedir"/patches/"$2"/ echo " Patches saved for $what to patches/$2" }