diff --git a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch index 6d87f0bb6..0c9a1f15d 100644 --- a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/pom.xml b/pom.xml -index 75483fe1abe6fa26f69cb437aefee4a9d51e078f..598429db84ef69220099cf3b890b16c26666b5cc 100644 +index db8ebc72f9ddfb33a3aa3d2e0366ef4f6f324567..30253c7c0da5c5940fab16df0f118e1b167712e8 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,12 @@ diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch index 862d94230..a8282e8ab 100644 --- a/Spigot-API-Patches/0007-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index b46653655d1da3ffe54d91b038ec360cd77f0c44..573d959a0a534b72338566eea0a9eca4124dba92 100644 +index 0ce26694eab5609d82c5498d1586b3dc22b4a037..20c9006b33851e0e1cc12c390dc65a41222cc969 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -595,4 +595,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch index 5986fb969..62b0cab43 100644 --- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index 598429db84ef69220099cf3b890b16c26666b5cc..8cc19e3da4598750c80c95b1153858049e07740f 100644 +index 30253c7c0da5c5940fab16df0f118e1b167712e8..01263d58c48324131b8feb20404174e1d40754a5 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,17 @@ diff --git a/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch index cda4e99a2..ea8b615f0 100644 --- a/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch +++ b/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 573d959a0a534b72338566eea0a9eca4124dba92..aaedcb3039d746be0db230cbbf0570609e71a028 100644 +index 20c9006b33851e0e1cc12c390dc65a41222cc969..9902b05352ce2acaf2bdd871238c6d80f255f0f1 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -606,5 +606,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/Spigot-API-Patches/0064-LivingEntity-setKiller.patch b/Spigot-API-Patches/0064-LivingEntity-setKiller.patch index 30e5a4960..b7b93870e 100644 --- a/Spigot-API-Patches/0064-LivingEntity-setKiller.patch +++ b/Spigot-API-Patches/0064-LivingEntity-setKiller.patch @@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 3154b1cb18b1cf97705ccd2e52bd87bd6cf5d8cf..a2bdecc8b27652460064126f8e5bb8d038f5d11a 100644 +index 45e9f585c3e522ecf94a6bc42cdc190e1a191a5c..33fffda7c8b05cde3c95623937e7eb6c8b628ec6 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -279,6 +279,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch index 4facb41d4..a740228cd 100644 --- a/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index 8cc19e3da4598750c80c95b1153858049e07740f..29dafd4b937e635bcce7b3712122ad3452fedfc2 100644 +index 01263d58c48324131b8feb20404174e1d40754a5..1c33b1f4d2366116dd45478b8ad9cdb51fd6bb57 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,13 @@ diff --git a/Spigot-API-Patches/0079-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-API-Patches/0079-Add-setPlayerProfile-API-for-Skulls.patch index f53e54310..42ffd3f94 100644 --- a/Spigot-API-Patches/0079-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-API-Patches/0079-Add-setPlayerProfile-API-for-Skulls.patch @@ -40,7 +40,7 @@ index 943d751fb3e48212fbe258845beba03c25fa22d9..a6914f01e01e9103702185f92b0209b3 * Gets the rotation of the skull in the world (or facing direction if this * is a wall mounted skull). diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java -index 35a392033eb13ec6788f87dff3e74b434498e2a1..8b2465ea23dd6b0e25f5b6bb5d526e21c7908f09 100644 +index 496254f959345d74167a9b44d160ea1bb428c5a1..88d1c889c09adb91abb09a8e43a30c871b217da2 100644 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java @@ -1,9 +1,11 @@ diff --git a/Spigot-API-Patches/0117-Entity-getChunk-API.patch b/Spigot-API-Patches/0117-Entity-getChunk-API.patch index 0f2568927..0eb01049c 100644 --- a/Spigot-API-Patches/0117-Entity-getChunk-API.patch +++ b/Spigot-API-Patches/0117-Entity-getChunk-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API Get the chunk the entity is currently registered to diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index aaedcb3039d746be0db230cbbf0570609e71a028..8ab223674fe39e745bc6f24561ed71113182605b 100644 +index 9902b05352ce2acaf2bdd871238c6d80f255f0f1..5e988ac7a639476c0f80786c8aea51ba3377fd10 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -3,6 +3,7 @@ package org.bukkit.entity; diff --git a/Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch index a2e604604..3aa64797b 100644 --- a/Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch +++ b/Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch @@ -16,7 +16,7 @@ which results in a hard crash. This change removes the synchronize and adds some protection around enable/disable diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 8ab223674fe39e745bc6f24561ed71113182605b..5a8f833ddd488cb1d3f817aadbd67e9850b26681 100644 +index 5e988ac7a639476c0f80786c8aea51ba3377fd10..d6451c82e0189e2c591a0fc1f884e83931d5a41b 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/Spigot-API-Patches/0143-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0143-Add-ray-tracing-methods-to-LivingEntity.patch index f60f98018..96c37c9d4 100644 --- a/Spigot-API-Patches/0143-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-API-Patches/0143-Add-ray-tracing-methods-to-LivingEntity.patch @@ -65,7 +65,7 @@ index 0000000000000000000000000000000000000000..18a96dbb01d3b34476652264b2d6be37 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index e0f77cf3a3aa8a741f0ee5c077ff56e80605be76..0ad31337a03743a6ceec1c2b018fecc47b1be089 100644 +index 8b89c0701dd557bcab0c05c1593354ee704b9fe4..8fe7ccf12339355554835542cc1068d9f6c3a435 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -82,6 +82,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/Spigot-API-Patches/0155-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0155-Add-LivingEntity-getTargetEntity.patch index 6f65bc5cd..cc02ae973 100644 --- a/Spigot-API-Patches/0155-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-API-Patches/0155-Add-LivingEntity-getTargetEntity.patch @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..f52644fab1522bdf83ff4f489e9805b2 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 0ad31337a03743a6ceec1c2b018fecc47b1be089..0624099fcd28c7f108131cb0f58d323818379838 100644 +index 8fe7ccf12339355554835542cc1068d9f6c3a435..561db9d594633e3909fd6d69dad1dc2976928d58 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -151,6 +151,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/Spigot-API-Patches/0171-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0171-Entity-getEntitySpawnReason.patch index bb9b8e394..0426c5356 100644 --- a/Spigot-API-Patches/0171-Entity-getEntitySpawnReason.patch +++ b/Spigot-API-Patches/0171-Entity-getEntitySpawnReason.patch @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 06f41958b98d9f105a9735509b4eb50ebf0fbf60..df15c0f2e52abc51f35d6e00e17ffa0ea39d838b 100644 +index 12729b6d9b3902c7c225655de273cb3c075fb695..0053b1d4f6ebf21d108dd40b9ce2a9e081ecea98 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -649,5 +649,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/Spigot-API-Patches/0213-Add-entity-liquid-API.patch b/Spigot-API-Patches/0213-Add-entity-liquid-API.patch index 38142e6a7..29407fb36 100644 --- a/Spigot-API-Patches/0213-Add-entity-liquid-API.patch +++ b/Spigot-API-Patches/0213-Add-entity-liquid-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index df15c0f2e52abc51f35d6e00e17ffa0ea39d838b..cb9ef706eeb994f1948708ad5e8689550ea56df7 100644 +index 0053b1d4f6ebf21d108dd40b9ce2a9e081ecea98..d9ffa92f817f3b850cd7272450d2432b47f1fecf 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -655,5 +655,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/Spigot-API-Patches/0227-Entity-isTicking.patch b/Spigot-API-Patches/0227-Entity-isTicking.patch index 6f96e6c71..defe6495e 100644 --- a/Spigot-API-Patches/0227-Entity-isTicking.patch +++ b/Spigot-API-Patches/0227-Entity-isTicking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index cb9ef706eeb994f1948708ad5e8689550ea56df7..9bae4704b306b1d04534072690355983856c7801 100644 +index d9ffa92f817f3b850cd7272450d2432b47f1fecf..3c4369841d6d890dc2a5f161d5d0099bd535a0c6 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -690,5 +690,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/Spigot-API-Patches/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/Spigot-API-Patches/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch index fab33a212..71f29a06c 100644 --- a/Spigot-API-Patches/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch +++ b/Spigot-API-Patches/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Clarify the Javadocs for Entity.getEntitySpawnReason() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 9bae4704b306b1d04534072690355983856c7801..4d1970bec04c5a3cf01d214f583efb0e1d08380d 100644 +index 3c4369841d6d890dc2a5f161d5d0099bd535a0c6..ff2e4fc8a632453e280f1a6ec05878b0e7fd2a9c 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -651,7 +651,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index 037ea456b..0d1ed1c1f 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -577,7 +577,7 @@ index bb06a7e3f3f9e4740cf6b874586e44f479d99cc4..d91b029c95b6380300db81e7c0fb172f this.setPVP(dedicatedserverproperties.pvp); this.setAllowFlight(dedicatedserverproperties.allowFlight); diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index d8a3851b47f8d3ff74869a50838b31c34156689a..c6bd37ac10aaf401dc4e48a11782a528eab28b85 100644 +index 18f510c2be4f6630c25b3f404234f3843ece817b..a314ed0106cbf4359dd1920bb4b3c6095b2550ee 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -588,7 +588,7 @@ index d8a3851b47f8d3ff74869a50838b31c34156689a..c6bd37ac10aaf401dc4e48a11782a528 import java.util.UUID; import java.util.function.Function; import java.util.stream.Stream; -@@ -468,4 +469,10 @@ public class EntityTypes { +@@ -469,4 +470,10 @@ public class EntityTypes { return new EntityTypes<>(this.a, this.b, this.d, this.e, this.f, this.g, this.c, this.j, this.h, this.i); } } diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch index bbdb2f139..0464df2e4 100644 --- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch @@ -848,10 +848,10 @@ index 83d799bec90693e0fbbf8a7f3bc4f569b5c0ead9..141a8e31151010e5a0bd8d4661033f10 t0.a(nbttagcompound.getCompound("data")); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 889dd0ca3eaeaf4d9843637e3a08d5eb9773f942..2a2e812d7a72077dc3b66ab4b5c6a00664c54287 100644 +index c37af6dffb17e31c81843f0e25cef57dce8b1d45..6a8321184068888a9d3a699e5fa357ad3e73ee2c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1796,7 +1796,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1798,7 +1798,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { } // CraftBukkit - decompile error diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index 74322cd37..8319c0b8f 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -3133,7 +3133,7 @@ index efba3b772238cabd5981978bee5d7dc76115f93f..74426693c47b6437a4597ddd1b961aae super(entitytypes, world); this.f = 5; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b9ed037ba86ea578d0cf5e0e43281d749981a842..829dd175930e87d1286be0a2265846d9c55e9389 100644 +index 5f44def6a5a7d9442a7f494d827e3467ecf953ed..74f5cdd4a73d33f593de86eaa0361c35e54e690d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -95,6 +95,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -3155,7 +3155,7 @@ index b9ed037ba86ea578d0cf5e0e43281d749981a842..829dd175930e87d1286be0a2265846d9 this.displayName = this.getName(); this.canPickUpLoot = true; diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index c6bd37ac10aaf401dc4e48a11782a528eab28b85..83593ff0549b770e3af148ad0105f22351e39d45 100644 +index a314ed0106cbf4359dd1920bb4b3c6095b2550ee..ef2a276fa2bdcac789e2f195a9d06ecce38daa45 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -3166,7 +3166,7 @@ index c6bd37ac10aaf401dc4e48a11782a528eab28b85..83593ff0549b770e3af148ad0105f223 import java.util.UUID; import java.util.function.Function; import java.util.stream.Stream; -@@ -310,8 +311,8 @@ public class EntityTypes { +@@ -311,8 +312,8 @@ public class EntityTypes { return this.br.height; } @@ -4496,7 +4496,7 @@ index 5719ef9714e9680596a08c42c33508c16c0e676a..bb0f30f182856d2701fde9b1a65eeb98 return this.j.m(); } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2a2e812d7a72077dc3b66ab4b5c6a00664c54287..544186bbd32ddd1b209ec344a77dfa00ff70aea6 100644 +index 6a8321184068888a9d3a699e5fa357ad3e73ee2c..c54f297e89939fa27c7c39ff6d0110aba537e6ce 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -12,6 +12,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry; @@ -4516,7 +4516,7 @@ index 2a2e812d7a72077dc3b66ab4b5c6a00664c54287..544186bbd32ddd1b209ec344a77dfa00 boolean tickingEntities; private final MinecraftServer server; public final WorldDataServer worldDataServer; // CraftBukkit - type -@@ -1565,7 +1566,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1567,7 +1568,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { ObjectIterator objectiterator = spawnercreature_d.b().object2IntEntrySet().iterator(); while (objectiterator.hasNext()) { diff --git a/Spigot-Server-Patches/0005-Paper-Metrics.patch b/Spigot-Server-Patches/0005-Paper-Metrics.patch index b8208d49a..a26eba0d2 100644 --- a/Spigot-Server-Patches/0005-Paper-Metrics.patch +++ b/Spigot-Server-Patches/0005-Paper-Metrics.patch @@ -647,7 +647,7 @@ index 0000000000000000000000000000000000000000..f2a0a9f5d86820ce8098301256d2faf3 + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 68d3cb02dbfdc9d6f9d3682a2659c9430b50c490..b367bb8ea184489f433f8acc798466c38816ae62 100644 +index 2c0514892d3993bef57ecf677cf8bb0fbe0216e4..da922f395f0fff0881ead893c900c5b2623f48f0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -42,6 +42,7 @@ public class PaperConfig { @@ -671,7 +671,7 @@ index 68d3cb02dbfdc9d6f9d3682a2659c9430b50c490..b367bb8ea184489f433f8acc798466c3 static void readConfig(Class clazz, Object instance) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index ff1ddfcfe0f231c3726c0b985288b4c3cdc5f64d..fdca34346a31a6096b8005670464a4c42ae2f73b 100644 +index f08110a22646716bcdf6a8d25ec44df8d78e85a4..23c1ba33903f8913a33332d06b2fd1aa3c90f1a1 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -83,6 +83,7 @@ public class SpigotConfig diff --git a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch index 000def4d7..cb73fbf0b 100644 --- a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch +++ b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch @@ -19,7 +19,7 @@ index b8868b86338ce0e89bc74eccccf714b910d7a4fe..9cb2f3b31921870ddba044840e99eb04 MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.chunkX, e.chunkZ); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index cf9b2c6675e6d875aea2eb66a3d91e86712a1b4d..8cd7c8d5d1a20239ffb3b064f8bd0b7a45cfc63f 100644 +index 54bbd1ca159d85bb90187edfcca1c38586c3557f..f6b97eec33ace01077e6bca58f3c11978422ac47 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -51,7 +51,7 @@ import org.bukkit.event.player.PlayerTeleportEvent; @@ -65,10 +65,10 @@ index cf9b2c6675e6d875aea2eb66a3d91e86712a1b4d..8cd7c8d5d1a20239ffb3b064f8bd0b7a protected abstract void loadData(NBTTagCompound nbttagcompound); diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index e08ccba8134846ef11928183d118a6cce53b6d89..ffb8685e7c457483bcf4b2ed1065fec0fbaa69e2 100644 +index ef2a276fa2bdcac789e2f195a9d06ecce38daa45..9946985407561596c6c364526d2fe7477771303a 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java -@@ -253,6 +253,7 @@ public class EntityTypes { +@@ -254,6 +254,7 @@ public class EntityTypes { } } @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..743142d0303fa25fe48a2abb07040d12 + } +} diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 6f6f58672d882f36296bc4f65d075261fc6da912..cfbca7cfde3160e888e14c5bb3bc48267f1cb599 100644 +index f002bafbf0ab5a240dd404416db87470f40e0296..b8f0653e3e82824a62dfe64348a33ab6432b4e17 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.InventoryHolder; diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index f30c1bb86..100e0eac9 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -667,7 +667,7 @@ index 0000000000000000000000000000000000000000..944fd203e9f39d6c6fc9e270940c76c9 + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 357856e5abcbc91452fa5b09643522f04843f71d..4479f74daef573bcbb6757186440bf47a3aef912 100644 +index da922f395f0fff0881ead893c900c5b2623f48f0..b4056cabb16f38ab8d45b887d9c4bf37b5b64bb4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -14,12 +14,15 @@ import java.util.concurrent.TimeUnit; @@ -1118,7 +1118,7 @@ index fea94330301a7859cd7ab9af7a9cd3f6d2d8e79a..c3aca7ebf5aae1c0582a0683920a4b82 if (!this.world.isClientSide && this.dO() && this.aG()) { this.damageEntity(DamageSource.DROWN, 1.0F); diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 9fad0c005ada01fdff97c791c769978ae5d56920..ebffa433a4df6e573db76d95762a169d02658d72 100644 +index 9946985407561596c6c364526d2fe7477771303a..b1fe488e41a2c9f77df091e1d14ed5c87a4358c8 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -151,7 +151,9 @@ public class EntityTypes { @@ -1147,7 +1147,7 @@ index 9fad0c005ada01fdff97c791c769978ae5d56920..ebffa433a4df6e573db76d95762a169d } @Nullable -@@ -381,6 +391,12 @@ public class EntityTypes { +@@ -382,6 +392,12 @@ public class EntityTypes { return this.bn; } @@ -1160,7 +1160,7 @@ index 9fad0c005ada01fdff97c791c769978ae5d56920..ebffa433a4df6e573db76d95762a169d public boolean isDeltaTracking() { return this != EntityTypes.PLAYER && this != EntityTypes.LLAMA_SPIT && this != EntityTypes.WITHER && this != EntityTypes.BAT && this != EntityTypes.ITEM_FRAME && this != EntityTypes.LEASH_KNOT && this != EntityTypes.PAINTING && this != EntityTypes.END_CRYSTAL && this != EntityTypes.EVOKER_FANGS; } -@@ -468,7 +484,7 @@ public class EntityTypes { +@@ -469,7 +485,7 @@ public class EntityTypes { SystemUtils.a(DataConverterTypes.ENTITY_TREE, s); } @@ -1541,7 +1541,7 @@ index 2c671629a43f42da8335e7216f9fd399bb878729..eb3269e0ea3ce33d08e9eee3bca7cf43 PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index b9387f4bfa598c4ad8a559a983f3499142d795cd..73ec13ff213ed52a4a5bb79cbd9079f1e74ced8a 100644 +index 8206523e78176f485605c35d5ff9ae63ab363a65..5b49047b820dbe1f326320b71445ac216bf688b5 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -1680,7 +1680,7 @@ index 43f49a2a7f62227f35c309d4d63088a6e013481b..8703a001c9d2bf114b140a94f20e0cf7 CrashReport crashreport = CrashReport.a(throwable, "Ticking entity"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked"); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 544186bbd32ddd1b209ec344a77dfa00ff70aea6..11497c73f40b0c681585cf6efca99a63eeb62e76 100644 +index c54f297e89939fa27c7c39ff6d0110aba537e6ce..da01aac42b32af6831a69f49e43d77fd6d5704ca 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -2,6 +2,8 @@ package net.minecraft.server; @@ -1787,7 +1787,7 @@ index 544186bbd32ddd1b209ec344a77dfa00ff70aea6..11497c73f40b0c681585cf6efca99a63 } } -@@ -753,6 +767,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -754,6 +768,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { if (!flag1) { org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit @@ -1795,7 +1795,7 @@ index 544186bbd32ddd1b209ec344a77dfa00ff70aea6..11497c73f40b0c681585cf6efca99a63 if (iprogressupdate != null) { iprogressupdate.a(new ChatMessage("menu.savingLevel")); } -@@ -762,7 +777,10 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -763,7 +778,10 @@ public class WorldServer extends World implements GeneratorAccessSeed { iprogressupdate.c(new ChatMessage("menu.savingChunks")); } diff --git a/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch b/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch index 3f002e3a2..faab5c918 100644 --- a/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch +++ b/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch @@ -126,7 +126,7 @@ index 0000000000000000000000000000000000000000..5deed3e25ff41ab0a4015a5fd0c1e952 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index bfecee2c9e4c68d5e254b445b3100247322017fc..185a0600e655f0ae85d22c438e9beb398cb12896 100644 +index 4075553d0abe19442903add9854f61cd657ab0ce..e1a8a4fdcc74dcd40b5230e84d56e97d4706ae36 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -343,6 +343,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch index 09373b950..ee512ed04 100644 --- a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d8766f302ed6512d3b4e8bb6508a71e5c8910b54..39ee76225bcb6b44050d41bc5da1dbc63cab1220 100644 +index 47e1845ca967210d15bf2beba32442ec8b1bde34..a54c0b9c7c0de7c74813717e690cc9aa6cc32b67 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1269,6 +1269,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index d8766f302ed6512d3b4e8bb6508a71e5c8910b54..39ee76225bcb6b44050d41bc5da1dbc6 double d3 = this.locX() - d0; double d4 = this.locY() - d1; diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index e16be546b22c09e1c6ed50c453e1f2c711832a81..683d98dea1b46931478ac7b55e49bc9d92d36f77 100644 +index 8b09f27f805a49085f5a34620a2390bb7eda5f01..4ba524df18fa5e37bb4cee013a024a61a8239453 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -70,6 +70,9 @@ public abstract class EntityHuman extends EntityLiving { @@ -31,7 +31,7 @@ index e16be546b22c09e1c6ed50c453e1f2c711832a81..683d98dea1b46931478ac7b55e49bc9d // CraftBukkit start public boolean fauxSleeping; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 71e8d8c0c4c5ec1ebb67a4cf5ce3c751a5fd052a..4e46685e9d0564ed9330fbec35848f4cd1fb516c 100644 +index c80d7f72a55ae92587ba8a4618787fb712bdaf23..61b5a3d14413455e22857f72e6b5d825f5b589d8 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -691,7 +691,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -44,7 +44,7 @@ index 71e8d8c0c4c5ec1ebb67a4cf5ce3c751a5fd052a..4e46685e9d0564ed9330fbec35848f4c if (entityhuman != null) { double d0 = entityhuman.h((Entity) this); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java -index 17a0ebfcd7eefa63adc581479244231b20150340..35f15c8ddd7c85aeb599bc7921053abe09130e59 100644 +index f5899fc014cfcc4b7e769d51e867ce1eaf625188..28b490cc14f5881eb83acfbd6f30f9163ffe1926 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -95,7 +95,7 @@ public class EntitySilverfish extends EntityMonster { @@ -57,7 +57,7 @@ index 17a0ebfcd7eefa63adc581479244231b20150340..35f15c8ddd7c85aeb599bc7921053abe return false; } diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index 797249069b0b2adf91b4e69497752eed7116f02a..b6cf294e785b36b8bc800f26dbb8cfcb2119eae1 100644 +index f433e1f6e6d430bd35a0fb54ee85295ea06f53bd..14400d0e4b0713e852861ed55e289e4dead95cea 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -83,8 +83,9 @@ public interface IEntityAccess { @@ -101,7 +101,7 @@ index 797249069b0b2adf91b4e69497752eed7116f02a..b6cf294e785b36b8bc800f26dbb8cfcb Iterator iterator = this.getPlayers().iterator(); diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index 8061f33c01b9c2382f72d2d1d1fa2fb8a731e3c8..e8e7532493c973ce10d94a41676859674fc4e6f6 100644 +index 143cfd9e99e9e0639bc32dd19efa84535a1fe03d..ff1ddb4db5406f81453a8f075033d00e06bce6a5 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -24,6 +24,12 @@ public final class IEntitySelector { @@ -131,7 +131,7 @@ index 90af43930f9141b0c7f51bb3d887d7b9c4d935eb..1741ec5e241f8ae7a3c30a9021d14cb0 public void c() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4f8745ce03eef96597963f5c2e08055f51686755..ae7fd1cfdf2a5c222959ca8694b98a77b69e7885 100644 +index 756e5d416e5a53eaf93f434ed27b3517f11bfef5..30bf765131f6502a823606863c611e281add9a19 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1709,7 +1709,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch index 44d2fbced..68463889e 100644 --- a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Only refresh abilities if needed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ae7fd1cfdf2a5c222959ca8694b98a77b69e7885..8e53988ab9639a7f9c2b21c7a66f3c4a2edeb2cf 100644 +index 30bf765131f6502a823606863c611e281add9a19..32775b97926f470a2e0a5c1c0ead81b7d4e97476 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1389,12 +1389,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch index b77ad8237..1fa501d68 100644 --- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch @@ -101,10 +101,10 @@ index ad8a506bb430b26fe147a657a2f826daf9bf4d45..ad4807e0bdd6409bd798f995da8f43ce if (i >= 0 && i < this.list.size()) { NBTBase nbtbase = (NBTBase) this.list.get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 11497c73f40b0c681585cf6efca99a63eeb62e76..37c4b75f4dcb490e243082897713583060f394b2 100644 +index da01aac42b32af6831a69f49e43d77fd6d5704ca..5c5229a815f098411450f6affb883c40c170fb2e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1133,6 +1133,11 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1135,6 +1135,11 @@ public class WorldServer extends World implements GeneratorAccessSeed { this.navigators.add(((EntityInsentient) entity).getNavigation()); } entity.valid = true; // CraftBukkit diff --git a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch index a446d8afb..ed8bffcb2 100644 --- a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity and entity crashes diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 8f51a1e5e37566001e1d419065ce730768c1b342..950dc3de042159de9f667dcd2499f4ee16525b0b 100644 +index f1d0e2faffb3ef27f5a41d06d0ff7d787f1098f5..da96a91c6b4cc03ad2e4539053bd30e7dc62dfe8 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -194,7 +194,12 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -23,7 +23,7 @@ index 8f51a1e5e37566001e1d419065ce730768c1b342..950dc3de042159de9f667dcd2499f4ee } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index abdad96225985e5c216394f64d646755a3992333..d1158ffb4475372a0c372cc5b097923c0cbaad36 100644 +index ebf719d45cd07082ef794028592fbd923177134d..dab129dd83024bdcee251393e1854ff384ff3c26 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -685,11 +685,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch index 14f917d39..fe705727c 100644 --- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch @@ -20,7 +20,7 @@ index a005c4398336dba3b5e3ef716f44f2eda7306442..88f5a415770da5dfcf7af95045f547e0 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 829dd175930e87d1286be0a2265846d9c55e9389..8794b8a7eeaa31fb544b39d9a8a39af47e2f9c21 100644 +index 74f5cdd4a73d33f593de86eaa0361c35e54e690d..e1bb73282990b685a9d767b3aa9ea16791c15e9a 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -61,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch index 3ec99f3c2..d0457fefc 100644 --- a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch +++ b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix lag from explosions processing dead entities diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index bf910359de9365f51461ec1b80aaabdb24e26449..8e7b9f11ee8a9010084960fb41a41eeadc06780e 100644 +index 583833f8634cb5b02cd8dcbb74c9876fb854bceb..afe61a1ddc75f155836411b6749198f71ed09919 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -154,7 +154,7 @@ public class Explosion { diff --git a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch index 990ecdde3..b78a3fa5b 100644 --- a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch @@ -19,7 +19,7 @@ index 8f45fa5ca878428a9ce6b18df075d3f09b2cf757..1d8d1a4e387f205f6c1c9b608f20e307 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8794b8a7eeaa31fb544b39d9a8a39af47e2f9c21..aed80f8a4a39d677ee0ea82f8795c5c8fdedcd6c 100644 +index e1bb73282990b685a9d767b3aa9ea16791c15e9a..a91c4facac9cc1b7c2e497be77af636ac2b36138 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -80,6 +80,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch index 1630f6aee..82481470c 100644 --- a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch +++ b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable spigot tick limiters diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 19985380f8a2b34ed7395ad356c49ce892149972..e542bb007e2ac087ea81688fadfdd07d98f0c245 100644 +index 611c7a5c1da8afa9a8caaa668c40517d560c8396..9714aeeb1e6431a494fdce8f81cd470a70c5e228 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -655,9 +655,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch index 1603691e7..2cbee116f 100644 --- a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch @@ -9,7 +9,7 @@ This is a duplicate API from spigot, so use our duplicate subclass and improve setPosition to use raw diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 945d9c91bd967180a9fdacf75b66ca5a21c08a3a..8e9f9605d575e97b17fde3b76e98d41b30a81c49 100644 +index 73ec13ff213ed52a4a5bb79cbd9079f1e74ced8a..7c6e35590f4217ec68ddfc3e189b847eb48b1c20 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -143,7 +143,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch index 3a4e4b6ed..75179086e 100644 --- a/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 1a89a83c32fac19b5ccd6757d0b92cc2b8434087..e021e731b01ca78b086812fcf6f2ae8533df7e87 100644 +index 422e5578a0b9ae0ddc98e4c43d63fcb5e535e5d2..9f7334ae769438cdd77508000e7721f57b30e225 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -111,7 +111,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch index 2f2a8c278..0633d63e4 100644 --- a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch @@ -52,7 +52,7 @@ index 3a6e780007bc1b1fa799166daa01d3a9e15c7ab0..535056c64ef866e645b1bfbd149b50c5 if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8e53988ab9639a7f9c2b21c7a66f3c4a2edeb2cf..671cab3efd94b81b0d71af3e096ffe9108d36258 100644 +index 32775b97926f470a2e0a5c1c0ead81b7d4e97476..04a3700c6d4caffcf5b8f7867d12d42ac4478a37 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch index 227cf6289..240dce179 100644 --- a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch +++ b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Change implementation of (tile)entity removal list use sets for faster removal diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e542bb007e2ac087ea81688fadfdd07d98f0c245..f0f099c28dcbfa2914fc86e87c52d70b68883ebe 100644 +index 9714aeeb1e6431a494fdce8f81cd470a70c5e228..7cc5b8d8ccedc550dccfa51f6dcc0fcbd3641aee 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -37,7 +37,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch index c1d129af6..76b9f56ad 100644 --- a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch @@ -139,7 +139,7 @@ index 135f38cc5d5d2fa3866aa1063df49a96b5e72ac2..f722b148464b7b8e515dba25aeffe8df } finally { if (filechannel != null) { diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 278e7bcd4bed86c32dea7f7cce419df089dceb43..ca3dc5a113554381a2ff97cb3175eda1ec4034ae 100644 +index d787fab2c25e31ca6caa56c5e47409512c5ac568..137ee1b453b80e96c1a8fa3271f6350f9294cafb 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -14,6 +14,7 @@ import org.apache.logging.log4j.LogManager; @@ -150,7 +150,7 @@ index 278e7bcd4bed86c32dea7f7cce419df089dceb43..ca3dc5a113554381a2ff97cb3175eda1 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; // CraftBukkit end -@@ -267,6 +268,7 @@ public final class SpawnerCreature { +@@ -268,6 +269,7 @@ public final class SpawnerCreature { } } catch (Exception exception) { SpawnerCreature.LOGGER.warn("Failed to create mob", exception); @@ -158,7 +158,7 @@ index 278e7bcd4bed86c32dea7f7cce419df089dceb43..ca3dc5a113554381a2ff97cb3175eda1 return null; } } -@@ -373,6 +375,7 @@ public final class SpawnerCreature { +@@ -374,6 +376,7 @@ public final class SpawnerCreature { entity = biomesettingsmobs_c.c.a((World) worldaccess.getMinecraftWorld()); } catch (Exception exception) { SpawnerCreature.LOGGER.warn("Failed to create mob", exception); @@ -187,7 +187,7 @@ index 1844a6504acc420bdfaaf8f045c569e970d055db..d6aadbda5c5a17976659f57ee04cf9b9 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c628b3f8a927d8ddba1c14c2dc60ae4fc517b56f..8ae490f5dbf9afc467f82fd7ea863bc9e247203b 100644 +index 7cc5b8d8ccedc550dccfa51f6dcc0fcbd3641aee..89d773ff59ad884a49a9ef26bc590d14c7df7776 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1,5 +1,10 @@ diff --git a/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch index 7a74a5504..ab2cc57d8 100644 --- a/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch @@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe A config option has been added for those who depend on the previous behavior, but I don't expect that. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index a62f4bbb973b9cb6d1ee53f56a0897d70ae176af..f207abbe757ad403a29a7a012903aaa88d5b1685 100644 +index b4056cabb16f38ab8d45b887d9c4bf37b5b64bb4..2ef80a4c2d75728dbf293962426994d00c2f0e2f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -214,4 +214,9 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch index cf2a46f49..90cd6fb71 100644 --- a/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 98742de5952c6d09592bdbcb12ed8862712a63e7..a69eadd57a2ccb30eaa5f997feebf0cbb2300065 100644 +index 4a67a78bbb7b633dcf5ea490b888898487a63d7a..67a64bba9944c0c87e7141469c460b7c4626e75f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3093,9 +3093,10 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch index df7980d23..d8f14badf 100644 --- a/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -5,7 +5,7 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a69eadd57a2ccb30eaa5f997feebf0cbb2300065..e9a67693f36345da1ef657a584f996928979188d 100644 +index 67a64bba9944c0c87e7141469c460b7c4626e75f..f9ae19f6997631c72afb6014cbec271f8e5bc3e9 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -603,7 +603,13 @@ public abstract class EntityLiving extends Entity { @@ -44,7 +44,7 @@ index a69eadd57a2ccb30eaa5f997feebf0cbb2300065..e9a67693f36345da1ef657a584f99692 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 65ba8b130328b681b67a01b06353ea382d004be6..eb86e8ff8c483b77d91a948411aaf167f6261091 100644 +index e070e4e874bb5c08ab130a9ab6f5f7234df8c1f1..9d10107169b5439c725b8450fab0b0d0dd96423e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1630,6 +1630,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch index 6caca87ae..113fef338 100644 --- a/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ab4405638f56844a54d4dba08bef11e7f54c568d..db271592ada5cbb20d2a0745557c491d8a35f816 100644 +index 02ad0b959e636d0f93cfd491b7b549364f92fbb6..1769e9b0f3d358253b6387491589916f7bb219fe 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -58,6 +58,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 189053824..42047a3e3 100644 --- a/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -176,7 +176,7 @@ index e356bd73901ac7f230492e654af579d21c8fc086..2bcd26ccccf4503241c6b77600ed6ce1 @Override public Fluid getFluid(BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/ProtoChunkExtension.java b/src/main/java/net/minecraft/server/ProtoChunkExtension.java -index 065eeed71075bb8f4069cb172ea7fca54793ddc0..09da0cc8f02c504191dfec8be93e6cf67c6afb78 100644 +index 5cfddbfe0bd84c994ed7fa4968bcf4fc13381001..420bf7116def909d3dd7dc9a799723446ddf8f7f 100644 --- a/src/main/java/net/minecraft/server/ProtoChunkExtension.java +++ b/src/main/java/net/minecraft/server/ProtoChunkExtension.java @@ -26,6 +26,11 @@ public class ProtoChunkExtension extends ProtoChunk { @@ -192,7 +192,7 @@ index 065eeed71075bb8f4069cb172ea7fca54793ddc0..09da0cc8f02c504191dfec8be93e6cf6 @Override public Fluid getFluid(BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 884e166826a73e0210f3c215d68cdf1a4bd00355..5f867e28ec349b4ff1ac1d9398c7bd6263cbf9c0 100644 +index c1d3dd294049c93beddaf5e4d513913cebb639df..92785a80bae6b5c88285536f74f23e0609d793ac 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -187,7 +187,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch index 3aa1c7cf1..532fa8307 100644 --- a/Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index e900ce242a84c8f6003905cf320070ea88ae13f3..b196dfb3de0ab6fa2cd57b970e5a36ccc3fcc352 100644 +index 058d222b97c2698518f165f5a5b59fb2aed565fa..f2d3ca17cd136db1e669477c15e660a8d39b0534 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1101,7 +1101,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1103,7 +1103,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { if (entity instanceof EntityInsentient) { this.navigators.remove(((EntityInsentient) entity).getNavigation()); } @@ -17,7 +17,7 @@ index e900ce242a84c8f6003905cf320070ea88ae13f3..b196dfb3de0ab6fa2cd57b970e5a36cc entity.valid = false; // CraftBukkit } -@@ -1139,6 +1139,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1141,6 +1141,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { entity.origin = entity.getBukkitEntity().getLocation(); } // Paper end diff --git a/Spigot-Server-Patches/0075-EntityPathfindEvent.patch b/Spigot-Server-Patches/0075-EntityPathfindEvent.patch index 6fae1a8a0..c8ea612f6 100644 --- a/Spigot-Server-Patches/0075-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0075-EntityPathfindEvent.patch @@ -19,7 +19,7 @@ index 95f916d5a08a7781278080c4f4abd4e152a945b5..da15615a19474d5db9bd46c3d772f467 private int u() { diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 0c3b986c07d9b8dc2012bfa5b27388a67f080ff8..d043bf14d25fd030ec5fa079e3272df0c11cc5f2 100644 +index edcc8af6ee36b937f61d3e52cb001b24fa16f690..48cf95db7226b23fc688aba47aea3b378faec14c 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -8,7 +8,7 @@ import javax.annotation.Nullable; diff --git a/Spigot-Server-Patches/0076-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0076-Sanitise-RegionFileCache-and-make-configurable.patch index 315550f51..f5786a219 100644 --- a/Spigot-Server-Patches/0076-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/Spigot-Server-Patches/0076-Sanitise-RegionFileCache-and-make-configurable.patch @@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap). The maximum size of the RegionFileCache is also made configurable. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index f207abbe757ad403a29a7a012903aaa88d5b1685..7d726757d1083011a09c9f2ca37c33a81360e964 100644 +index 2ef80a4c2d75728dbf293962426994d00c2f0e2f..21f75d3bbaf16e4970b5d11a223ff7eeca66d148 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -219,4 +219,9 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch index 15b0f46e4..002aa8ab0 100644 --- a/Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch +++ b/Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not load chunks for Pathfinding diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index d043bf14d25fd030ec5fa079e3272df0c11cc5f2..3ffa6b22dde89e26aea4b8e5ce0cd5db92dc9310 100644 +index 48cf95db7226b23fc688aba47aea3b378faec14c..5a8fbad220ed535a79539a4e25830c370ca1c89c 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -27,7 +27,7 @@ public abstract class NavigationAbstract { @@ -31,7 +31,7 @@ index 8ba6dd459a863717c91dd59f3f2ee5e3a5ed8170..b31d1f73ce0f067e352868b53eab7557 public Pathfinder(PathfinderAbstract pathfinderabstract, int i) { diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index 40fd404fd3d7715efb1eeee4f1715acc2368c577..a0555b132d6ddd2c6c259ae569e411606e496d1d 100644 +index 449665f52c5f241d2119919abe4d4cde638ebe6f..07b021bd1fb174d1c1a0c83b415c84e582c4f681 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -456,7 +456,12 @@ public class PathfinderNormal extends PathfinderAbstract { diff --git a/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch index 6a19bd690..dd9c4a5b2 100644 --- a/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix reducedDebugInfo not initialized on client diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 8e9f9605d575e97b17fde3b76e98d41b30a81c49..e68de1a715047ea83573ed963f1df50971bd85db 100644 +index 7c6e35590f4217ec68ddfc3e189b847eb48b1c20..7f76582918ce1ad48eb0feb9679cf2e2172f02db 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -174,6 +174,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index e577d3b11..5ead9786b 100644 --- a/Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 62af19816439beae85adf3c4de67971f3537d055..d55b688dcf41bf9082da311b143055d3a6683baf 100644 +index 19f0149051d9ff58223624754b27285c4c99b769..b2be738480442898603a1bd9f38aebb30ec9ebef 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -466,6 +466,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch index 8225a2427..b9fbffc11 100644 --- a/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players SPIGOT-1915 & GH-114 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index eb86e8ff8c483b77d91a948411aaf167f6261091..9aca1c0198f4d9e0b8b632aead499aaed240b091 100644 +index 9d10107169b5439c725b8450fab0b0d0dd96423e..c0ee227689c0865ecc4816ea534047aeb2b82c12 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -792,6 +792,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch index bb122acc9..0782edc19 100644 --- a/Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch @@ -67,10 +67,10 @@ index b2be738480442898603a1bd9f38aebb30ec9ebef..e1f2177b3ce48cc8f9bca6e014065d78 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index b196dfb3de0ab6fa2cd57b970e5a36ccc3fcc352..25d7e8d4ea4fd3f3f5b649866f105b4381aff0b3 100644 +index f2d3ca17cd136db1e669477c15e660a8d39b0534..030def2da5d3c246dfeb42f12b0148166274fdea 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1598,7 +1598,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1600,7 +1600,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { } bufferedwriter.write(String.format("entities: %d\n", this.entitiesById.size())); @@ -79,7 +79,7 @@ index b196dfb3de0ab6fa2cd57b970e5a36ccc3fcc352..25d7e8d4ea4fd3f3f5b649866f105b43 bufferedwriter.write(String.format("block_ticks: %d\n", this.getBlockTickList().a())); bufferedwriter.write(String.format("fluid_ticks: %d\n", this.getFluidTickList().a())); bufferedwriter.write("distance_manager: " + playerchunkmap.e().c() + "\n"); -@@ -1737,7 +1737,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1739,7 +1739,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { private void a(Writer writer) throws IOException { CSVWriter csvwriter = CSVWriter.a().a("x").a("y").a("z").a("type").a(writer); diff --git a/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch index b3ab09634..856b158fc 100644 --- a/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable Player Collision diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 7d726757d1083011a09c9f2ca37c33a81360e964..3d9a98936cfe933fd71fb82f07e1ba54d5d35800 100644 +index 21f75d3bbaf16e4970b5d11a223ff7eeca66d148..750508267982046d0c08cffdd57c28459f7ce9c1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -224,4 +224,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ index 7d726757d1083011a09c9f2ca37c33a81360e964..3d9a98936cfe933fd71fb82f07e1ba54 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 82ac7329aa0e9fada9a195afef65479865588393..a0d59bf7d7c5582f6221b4b8868cfd18101f79b9 100644 +index 2193e395e05bbfcd32f95445c85b65ee4dca5ed4..cfa8ae00bfa5583c9e744180faccc607bc9508ba 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -432,6 +432,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 256, < 0, is tr Keep them consistent diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0c5299f97981a8394231a24b084b320cbecb0847..9040385c68db1dc004b5ce6cc62300e7da85073e 100644 +index 9599f1141c90e803ca0a9cd9b15ed1205beca8eb..8e005ead10a9ac738b0e626239926bbf30e16695 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -735,7 +735,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -736,7 +736,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { if (entity.cl()) { this.getMethodProfiler().enter("chunkCheck"); int i = MathHelper.floor(entity.locX() / 16.0D); diff --git a/Spigot-Server-Patches/0113-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0113-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index 069fe8404..37cd3b996 100644 --- a/Spigot-Server-Patches/0113-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/Spigot-Server-Patches/0113-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove FishingHook reference on Craft Entity removal diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java -index b1baf21dd3f1877ebd5390fb8860bce58bf5ca2e..bbaa246362eb72b8a951dac1182c8d2413f6984b 100644 +index bee31ee654b3b38ab88c9cb680deb69decff57ba..2e05fd8f52cd9f7afab5432c70e12bb30c48a027 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java @@ -82,4 +82,15 @@ public class CraftFishHook extends CraftProjectile implements FishHook { diff --git a/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch index 29c7cb93c..e9b496908 100644 --- a/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login Bring down to a saner Y level if super high, as this can cause the server to crash diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b4abf6a7ba8ce73868a3a63106ea542d0ca67024..09b2ad46f051c94988061018100086847ce0fb9a 100644 +index bc85a155a6ca0e21ca1dcf737c015e9919748345..35a5dbf4356b38ecf2acd699f15a103c3ee0b93c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -208,6 +208,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch index f8355e2c9..01e264bed 100644 --- a/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityZapEvent diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 61d9dbea6e932ecdae01458222286483a992a8e3..6848670104e12ac4529d4f210729c32675a2eac9 100644 +index 5bdde99d7143ee1bac5830b042bba5485a95f120..ee94c2827cfc53f7a37e61d8c1c0c30a52374cf8 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -208,6 +208,11 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable { @@ -21,7 +21,7 @@ index 61d9dbea6e932ecdae01458222286483a992a8e3..6848670104e12ac4529d4f210729c326 if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) { return; diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 0182836a801da077ca0e6fcc75e7095454fb2349..17ae6530bda22144866e94e8449220d108084fe5 100644 +index 824e172f06e57f86010836a1006a14d0a3b0bda3..eedec25373cfc8adec7ac8a99b146770dc15c70e 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -719,6 +719,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -38,7 +38,7 @@ index 0182836a801da077ca0e6fcc75e7095454fb2349..17ae6530bda22144866e94e8449220d1 entitywitch.prepare(worldserver, worldserver.getDamageScaler(entitywitch.getChunkCoordinates()), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null); entitywitch.setNoAI(this.isNoAI()); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 0c98f678ee979d4f4d6f4265e36a64b57e55ae26..e6420b1d59c8db78e3ad313c6709f64664e5aced 100644 +index 8c1602d786fbc67c43ba36a77150eac4e594eae9..7991262ec11b3a61ae0c681bcb1c7152b81d61a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1084,6 +1084,14 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch index 8b2aa48fd..0b66e62cf 100644 --- a/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache user authenticator threads diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 09b2ad46f051c94988061018100086847ce0fb9a..ea275587cbe06f5624b4a5d05095e6d0964ea9b9 100644 +index 35a5dbf4356b38ecf2acd699f15a103c3ee0b93c..279b91d3de42bb7d3a1b99b836a2a6c2873a2077 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -4,7 +4,9 @@ import com.google.common.collect.Lists; diff --git a/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch index 3f49b0c1d..233e60db0 100644 --- a/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 23d5b7cb1a5cbe3409a0741af08b2fac8d1a58c1..604bdc5ab98071db88ac3e93ebf11869cc60a308 100644 +index fda68abbdd7c970048ba710d7ef35214f2aaa74c..2c2d44562f732c75532cda910db5ce67d6a534ab 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -188,7 +188,7 @@ public class EntityExperienceOrb extends Entity { @@ -18,7 +18,7 @@ index 23d5b7cb1a5cbe3409a0741af08b2fac8d1a58c1..604bdc5ab98071db88ac3e93ebf11869 this.die(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e6420b1d59c8db78e3ad313c6709f64664e5aced..d423313fd949ff1adf3f6d9c5f339a465e0f0b9e 100644 +index 7991262ec11b3a61ae0c681bcb1c7152b81d61a2..ce9e87b2e348c4b07a4dcbc81f82e115eeb3ebe8 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -123,6 +123,7 @@ import org.bukkit.entity.ThrownPotion; diff --git a/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch index 993f134f2..1f84df38d 100644 --- a/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add ProjectileCollideEvent diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 2fb014c2a20363c94045dd834f771cfd9baf37cd..a7c475454e627e54d6771c5023144d55ad389ae3 100644 +index 2a86d4b8af5e436e82e003f50c1929702af700c4..93084633d487684fb598038d148670fe6a00b3ed 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -160,6 +160,17 @@ public abstract class EntityArrow extends IProjectile { @@ -27,7 +27,7 @@ index 2fb014c2a20363c94045dd834f771cfd9baf37cd..a7c475454e627e54d6771c5023144d55 this.a((MovingObjectPosition) object); this.impulse = true; diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java -index d63b7b53da148ce404124115337e0dadf3357548..19aa9dab2509554417c2952eccd4ad5cb6008eda 100644 +index 1ee09cb383d762219bda89463f4b6af807799385..74ca38f8e4e1addc243c3f3b57021d26f0ce3c97 100644 --- a/src/main/java/net/minecraft/server/EntityFireball.java +++ b/src/main/java/net/minecraft/server/EntityFireball.java @@ -57,7 +57,16 @@ public abstract class EntityFireball extends IProjectile { @@ -71,7 +71,7 @@ index 7391fd31148dbde60e34955841a296f454ac768e..53a8ea7d1eff84abe6c49464d556aa27 this.checkBlockCollisions(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d423313fd949ff1adf3f6d9c5f339a465e0f0b9e..7239e9b9d072af9d1610fd2e06a123505e31a110 100644 +index ce9e87b2e348c4b07a4dcbc81f82e115eeb3ebe8..299fd2dd5b718acce790ac18f1fbbb23a148ed56 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1188,6 +1188,16 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch index 9ebf85449..c423dc71f 100644 --- a/Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch +++ b/Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border This prevents Entities from trying to run outside of the World Border diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 3ffa6b22dde89e26aea4b8e5ce0cd5db92dc9310..d39ce9c1816aaa33478dcd623056488ca21411f3 100644 +index 5a8fbad220ed535a79539a4e25830c370ca1c89c..ee7b1f25ba8b6b4318e332b739359db6ddd58b62 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -127,7 +127,7 @@ public abstract class NavigationAbstract { diff --git a/Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch index 558cb900e..a0af820e5 100644 --- a/Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z Reduce method invocations for World.isLoaded(BlockPosition)Z diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 61b21f82c44a51cc75e6e89b8b2f2467b0b5113a..f7b97f923891e3d0afe406dbc52a6eff5770f9c6 100644 +index f166add9a9f5542c26dad9c976dc59b4c6350be9..c8e767a32483584d57a5c42e87fba2c63d7f9e6b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -252,6 +252,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch index 1b2e75be2..41bfdda2b 100644 --- a/Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index ce9614e642d4e5e8cbea67a39061f99545fff942..254c7ad539edfbbd34464b80b523fa2134939ef9 100644 +index 12eba34f647f9ac1d3866cf6a127e928ac245c84..41aedbbe52761f79512a0676b096a1f8a9a49396 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -45,6 +45,7 @@ public class EntityArmorStand extends EntityLiving { diff --git a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch index f087fc510..691ba48d3 100644 --- a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 0c4a6ef28fd8cb04e7131b089ba392571e165ea6..d84b13e873d7f6c7e53f024c390105f19520eedd 100644 +index 279b91d3de42bb7d3a1b99b836a2a6c2873a2077..2a4b05e78c1931ee0df36d55bf1accde6eacf623 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1913,7 +1913,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch index 95420d0f5..9ba7b5e25 100644 --- a/Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch @@ -18,7 +18,7 @@ index bdfd17362518ff2398cf9e1743a7a4f0c7a0e966..cc14e4b4609fa7013df666181c0e02a5 public static Collector, ?, Map> a() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4148b53d08d7bde1c13d9cdca4330f1313b33409..207fb61243d87620b65720d4cb558c6234f92c92 100644 +index ba145b9a6e7cc82a1f9ee46db96487ab7a09a724..0101eccae2d7f55104c8ff1c38778db944e0c0aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -244,6 +244,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0133-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0133-PlayerTeleportEndGatewayEvent.patch index b4bb2e862..efd780ef2 100644 --- a/Spigot-Server-Patches/0133-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0133-PlayerTeleportEndGatewayEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent Allows you to access the Gateway being used in a teleport event diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index eb37395d83a16b7e94d6b8978ddf305b860a5534..717c736cbc4defd24c5d08b501227bbd3e00a7e8 100644 +index 3284143799db25f66d5311a9635e2890f63dcbe3..6a0f7b02c5a2663bb7304a1f8c6cbf1603507d45 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -155,7 +155,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick diff --git a/Spigot-Server-Patches/0145-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0145-Add-configuration-option-to-prevent-player-names-fro.patch index d9c56eb86..24a26d6b5 100644 --- a/Spigot-Server-Patches/0145-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-Server-Patches/0145-Add-configuration-option-to-prevent-player-names-fro.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index c4086de778cc2ccc958b1a94dd6e9cdb5065076c..5fa63d7ca20b88a44d8800b3ebf74e4c0e376d0b 100644 +index c74c653e1417b052d498b38c30d94214812d5778..fcf8aef72aa117c26d1780ae85704e23266c7555 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -260,4 +260,9 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0148-Item-canEntityPickup.patch b/Spigot-Server-Patches/0148-Item-canEntityPickup.patch index e920cd5b1..1d869dc7f 100644 --- a/Spigot-Server-Patches/0148-Item-canEntityPickup.patch +++ b/Spigot-Server-Patches/0148-Item-canEntityPickup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 4e46685e9d0564ed9330fbec35848f4cd1fb516c..ab96dd1ac20998b6458ecf6f3fb6f5a2d5189eba 100644 +index 61b5a3d14413455e22857f72e6b5d825f5b589d8..1b0c4234cf579b35f404c129c2c6d3266b670b09 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -539,6 +539,11 @@ public abstract class EntityInsentient extends EntityLiving { @@ -21,7 +21,7 @@ index 4e46685e9d0564ed9330fbec35848f4cd1fb516c..ab96dd1ac20998b6458ecf6f3fb6f5a2 } } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 13416bf95869987919e1fcd6b331c3fe2c2b5cee..2ca3886f532050ba7d360efd20a617ef8836c9df 100644 +index b1e953fc5c61abe0aeb667a12fd4491d11f422de..507ad727ce62a30b1120104b16737e21b777d7ae 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -20,6 +20,7 @@ public class EntityItem extends Entity { diff --git a/Spigot-Server-Patches/0149-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0149-PlayerPickupItemEvent-setFlyAtPlayer.patch index c1abdb12f..f0a67c04b 100644 --- a/Spigot-Server-Patches/0149-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-Server-Patches/0149-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 2ca3886f532050ba7d360efd20a617ef8836c9df..28aed9d9c2b4fe6ce8b1994e6ac3e3c5f786c2d1 100644 +index 507ad727ce62a30b1120104b16737e21b777d7ae..57a2fdfbcd04345901f8f596c68932b4942790a1 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -336,6 +336,7 @@ public class EntityItem extends Entity { diff --git a/Spigot-Server-Patches/0150-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0150-PlayerAttemptPickupItemEvent.patch index e6f15e3fd..1bbaeaef7 100644 --- a/Spigot-Server-Patches/0150-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-Server-Patches/0150-PlayerAttemptPickupItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 28aed9d9c2b4fe6ce8b1994e6ac3e3c5f786c2d1..6d9a03a1ccc78ae9eeb654dd7fab9f23fcce74b8 100644 +index 57a2fdfbcd04345901f8f596c68932b4942790a1..7e1cc212e22f21bec1f6b1a2d337ef2ee70dc699 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -9,6 +9,7 @@ import javax.annotation.Nullable; diff --git a/Spigot-Server-Patches/0153-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0153-Shoulder-Entities-Release-API.patch index 5af5adbeb..d901359af 100644 --- a/Spigot-Server-Patches/0153-Shoulder-Entities-Release-API.patch +++ b/Spigot-Server-Patches/0153-Shoulder-Entities-Release-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 196d1a7fa8ac9249ca061a704b2403c7bf1f4eb1..b64eecae09241360b6997200f931eb3a63470dab 100644 +index 980484baae997832dafa55a54e4a658507a05803..ca33de2d305487f0f2f50e14f5878c05e1c9845c 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1783,20 +1783,44 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0162-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0162-Ocelot-despawns-should-honor-nametags-and-leash.patch index 7067dc37a..c877511c6 100644 --- a/Spigot-Server-Patches/0162-Ocelot-despawns-should-honor-nametags-and-leash.patch +++ b/Spigot-Server-Patches/0162-Ocelot-despawns-should-honor-nametags-and-leash.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ocelot despawns should honor nametags and leash diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index 1ef2f13cba628305aec1c82a7e2426feccaca0d6..9dc55b78325292e55b2387db6b98dbca022dbbdf 100644 +index c56369817a28ec2c1a82f869c40fc7cb8eeb49dd..7bd3fea6e0e478337c7f6400a941675eebba517b 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -81,7 +81,7 @@ public class EntityOcelot extends EntityAnimal { diff --git a/Spigot-Server-Patches/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch index 5d94946cc..f1d5306c8 100644 --- a/Spigot-Server-Patches/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f7b97f923891e3d0afe406dbc52a6eff5770f9c6..269996130b85997bed4622eea781e3e9c0684c81 100644 +index c8e767a32483584d57a5c42e87fba2c63d7f9e6b..4d1a720bf7043a60546e165921def29b4465e72a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -673,7 +673,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0165-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0165-Allow-specifying-a-custom-authentication-servers-dow.patch index 86b06030e..f30989923 100644 --- a/Spigot-Server-Patches/0165-Allow-specifying-a-custom-authentication-servers-dow.patch +++ b/Spigot-Server-Patches/0165-Allow-specifying-a-custom-authentication-servers-dow.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index f9225e48d6b7916858ca7cc761444adb1ad89a6e..5fe6c36bdf8527d7fcb41e8d471194c7e395b946 100644 +index fcf8aef72aa117c26d1780ae85704e23266c7555..98686b6d660f14ea812b50fad423e513424983c2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0166-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0166-LivingEntity-setKiller.patch index 8459728d7..4040f4f4a 100644 --- a/Spigot-Server-Patches/0166-LivingEntity-setKiller.patch +++ b/Spigot-Server-Patches/0166-LivingEntity-setKiller.patch @@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 0e79f18eaf11b9abab193135af07f4db2035a7eb..f466b432bb1b976db23e3ad9622b6a4e66d9e28d 100644 +index f52c2faa42c45d1d8acf7002c306a7de3aadcb86..2fe60df578ad7d6087ae86759f22421a25e5258d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -87,7 +87,7 @@ public abstract class EntityLiving extends Entity { @@ -18,7 +18,7 @@ index 0e79f18eaf11b9abab193135af07f4db2035a7eb..f466b432bb1b976db23e3ad9622b6a4e protected int ticksFarFromPlayer; protected float aJ; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index ddcd44bb181559858677bd127e875d830c10ec95..3ee78da4090f36b34bd909e807715f7e9f31bcbf 100644 +index a81afaf47214dcb4452642a7e8f295eb94ca6501..e99e8e6f889edfa889619a12f9bfa4bfbde9a5a1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -344,6 +344,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch index 922b455be..83894fec0 100644 --- a/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Include Log4J2 SLF4J implementation diff --git a/pom.xml b/pom.xml -index ee5747efddbbff3ed11caa6cca326e6c55b60fc8..e3630cd3847c6a5d5b3c8a37fe6f101f938b8700 100644 +index 50379bfe731eb9538f365275c04a764b02944633..0c7a485ae7c2fbb5aa4c892d75a314a75056ba9a 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,12 @@ diff --git a/Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch index 92a2cab44..205c4e727 100644 --- a/Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch @@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..5caca6439d2135e34880d501397fe2ea + +} diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index ad2861cde180403069c96f5fd7e4d26ee918bbea..07d5036ce3b04c78f332deed65b9177b70b4361a 100644 +index 396c3f824968512e55987fd98d82d10e9cad6903..abace78271eedd453df692f4e24dacef474d215e 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -133,6 +133,10 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -76,7 +76,7 @@ index ad2861cde180403069c96f5fd7e4d26ee918bbea..07d5036ce3b04c78f332deed65b9177b @Override diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 5a0129d007459fbb868784f53585fd26f495358c..aeee6bfbc1c0113beef35bf33e8c6928a1db2844 100644 +index 6034f0cf5a22adb8441226cd54c519e41c198f6f..1b11b4a8d26bd174b0c6f97225555eb585f67836 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -60,6 +60,10 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -103,7 +103,7 @@ index 4f008e4723d2cb0bcabb2d5621203d63c40c4923..8545146fb1f093f821e3b966d9337049 return this.a; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6ca7a7a3267d3c8477c8333dea9ac2bbad230056..6eb02d0a69a0375ba099f776636de765612911e5 100644 +index 0101eccae2d7f55104c8ff1c38778db944e0c0aa..366912aa71ec8cd654977443786fa3cc44e0566a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -188,6 +188,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0173-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0173-revert-serverside-behavior-of-keepalives.patch index 2590a0469..7fb22fccd 100644 --- a/Spigot-Server-Patches/0173-revert-serverside-behavior-of-keepalives.patch +++ b/Spigot-Server-Patches/0173-revert-serverside-behavior-of-keepalives.patch @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9eb5ec1b8b0299bf964ed1f0f1b30a4ce1a1ecd3..8acbd8cb850461339c9990165106f104609efed0 100644 +index 8d0b1405655ad38d4849d0972d69a3f9cf4988cf..4bb4c9d4879ab6ee6e063b5b9a2acad0a52d2629 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -76,7 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0176-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0176-Add-PlayerArmorChangeEvent.patch index 07a7f6801..eb9b60b84 100644 --- a/Spigot-Server-Patches/0176-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-Server-Patches/0176-Add-PlayerArmorChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f466b432bb1b976db23e3ad9622b6a4e66d9e28d..ddcaa435f87171bd3940089c30ba6eea73546e1f 100644 +index 2fe60df578ad7d6087ae86759f22421a25e5258d..0bfc3a7a532a166497eff75ed355f05c96e216c4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0178-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0178-use-CB-BlockState-implementations-for-captured-block.patch index 9ff453441..98b83e25c 100644 --- a/Spigot-Server-Patches/0178-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0178-use-CB-BlockState-implementations-for-captured-block.patch @@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping information on restoration when the event is cancelled. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 269996130b85997bed4622eea781e3e9c0684c81..dc00ad1607dc6b05f8cb13470046d72f17aa115b 100644 +index 4d1a720bf7043a60546e165921def29b4465e72a..cc17d9862ed6169c332896d81dc18209234cfa00 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -71,7 +71,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch index c5517dcb4..d204aaa07 100644 --- a/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch +++ b/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch @@ -14,7 +14,7 @@ completion, such as offline players. Also adds isCommand and getLocation to the sync TabCompleteEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8acbd8cb850461339c9990165106f104609efed0..b92449c7035ebb330eb3aaa48e91a6d0b3873c5c 100644 +index 4bb4c9d4879ab6ee6e063b5b9a2acad0a52d2629..30bdf7dff8fc611677b95918574d4ad42ddf1c6c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -564,10 +564,10 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0181-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0181-Avoid-NPE-in-PathfinderGoalTempt.patch index 9beb581a0..d89286559 100644 --- a/Spigot-Server-Patches/0181-Avoid-NPE-in-PathfinderGoalTempt.patch +++ b/Spigot-Server-Patches/0181-Avoid-NPE-in-PathfinderGoalTempt.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Avoid NPE in PathfinderGoalTempt diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java -index a6fa45eedc26ddf78a67281c29f6b6b05a85707c..a6f67e473cfe2c9eb3d4466f9bc23b9d0212126b 100644 +index 74a24c2844d3fb5d6ff53b364c0566c007509e76..90738a547be8822e168abd1e8437a202d123229f 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java @@ -55,7 +55,7 @@ public class PathfinderGoalTempt extends PathfinderGoal { diff --git a/Spigot-Server-Patches/0182-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0182-PlayerPickupExperienceEvent.patch index 8480e9299..a404e7017 100644 --- a/Spigot-Server-Patches/0182-PlayerPickupExperienceEvent.patch +++ b/Spigot-Server-Patches/0182-PlayerPickupExperienceEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index deebd63e0297b245b82a620bc380c9f1a502027b..e2370b8cf76d6f06cbdaba009feaf5df98b36da4 100644 +index a9fff75882217b1fd680fd8fd47110f85d88df28..8354d18aa03d29202c82227a1891903a64c7921b 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -217,7 +217,7 @@ public class EntityExperienceOrb extends Entity { diff --git a/Spigot-Server-Patches/0183-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0183-ExperienceOrbMergeEvent.patch index 800f37386..c68ca0584 100644 --- a/Spigot-Server-Patches/0183-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0183-ExperienceOrbMergeEvent.patch @@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index cc2f749ae12a165581328e6dab39fa74e08a7222..e5fce28f7e2d544b98047aac2c3291e216e1d64e 100644 +index 68befc17134bfd4c453275ab2d11485ad7450e7c..f4242870654ea6faa6829348717cd2f3c3407679 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -595,7 +595,7 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0184-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0184-Ability-to-apply-mending-to-XP-API.patch index 955b3c02a..0ed1d1818 100644 --- a/Spigot-Server-Patches/0184-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-Server-Patches/0184-Ability-to-apply-mending-to-XP-API.patch @@ -10,7 +10,7 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java -index 42d6aa4bedb1978eb6e6f94e2a73520c879ab71a..b6b0460de9d7c25fafec37f4e02c2d82dd7ef986 100644 +index ff56d7b045d7d93419a5f2f35df70b3644ac55b0..7b263594304a9b745f583fe7178ac16936cbd93b 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java @@ -251,8 +251,8 @@ public class EnchantmentManager { @@ -25,7 +25,7 @@ index 42d6aa4bedb1978eb6e6f94e2a73520c879ab71a..b6b0460de9d7c25fafec37f4e02c2d82 return true; }); diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index e2370b8cf76d6f06cbdaba009feaf5df98b36da4..a2eaea4bd847ebe0b3dc35c95c4c29d6c73f4797 100644 +index 8354d18aa03d29202c82227a1891903a64c7921b..4df7df781d12e38885ecfbc89dd1d42d9de14248 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -249,10 +249,12 @@ public class EntityExperienceOrb extends Entity { @@ -42,7 +42,7 @@ index e2370b8cf76d6f06cbdaba009feaf5df98b36da4..a2eaea4bd847ebe0b3dc35c95c4c29d6 return i * 2; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index abc0466a2d6a059a401f57d93cd4e9465de14461..0ab5915d447b7a23deccb54763f54d09e83cf88e 100644 +index 366912aa71ec8cd654977443786fa3cc44e0566a..88da51fd414f0107ef0bbe5eea423c14275d6bc9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1098,8 +1098,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0186-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0186-PreCreatureSpawnEvent.patch index 2e3a33246..b7bae6ce1 100644 --- a/Spigot-Server-Patches/0186-PreCreatureSpawnEvent.patch +++ b/Spigot-Server-Patches/0186-PreCreatureSpawnEvent.patch @@ -47,7 +47,7 @@ index 34ab03fce7ab5c7702234590ffc9ca7fec72a86a..2827026ba4bdd857f231028393726d6c entity1.setPositionRotation(d3, d4, d5, entity1.yaw, entity1.pitch); return entity1; diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index ca3dc5a113554381a2ff97cb3175eda1ec4034ae..eb637c32f7a4faa99d30596c273e62ebffe74f3b 100644 +index 137ee1b453b80e96c1a8fa3271f6350f9294cafb..0ecdfd45073235b7b01e84f4490f17088c4ee675 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -184,9 +184,16 @@ public final class SpawnerCreature { @@ -68,7 +68,7 @@ index ca3dc5a113554381a2ff97cb3175eda1ec4034ae..eb637c32f7a4faa99d30596c273e62eb if (entityinsentient == null) { return; } -@@ -238,8 +245,24 @@ public final class SpawnerCreature { +@@ -239,8 +246,24 @@ public final class SpawnerCreature { } } diff --git a/Spigot-Server-Patches/0187-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0187-PlayerNaturallySpawnCreaturesEvent.patch index 9a95c1a62..505453fb5 100644 --- a/Spigot-Server-Patches/0187-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-Server-Patches/0187-PlayerNaturallySpawnCreaturesEvent.patch @@ -29,7 +29,7 @@ index 1daf3bea2cc488276b33e624e1591a71af1459d9..90812ab056acc39e62a43cb208bfd782 Optional optional = ((Either) playerchunk.a().getNow(PlayerChunk.UNLOADED_CHUNK)).left(); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a4e93985d2db37d1f597878cfb5069fbc7233aa4..36ac4fde147fb5c4d26f1bdbcf027fb0bf3edca7 100644 +index 2a4b05e78c1931ee0df36d55bf1accde6eacf623..26f81c1af1dda7d0a78ca5815bfaf825ba913efd 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0192-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0192-Extend-Player-Interact-cancellation.patch index 629f8fd75..ee4e2970f 100644 --- a/Spigot-Server-Patches/0192-Extend-Player-Interact-cancellation.patch +++ b/Spigot-Server-Patches/0192-Extend-Player-Interact-cancellation.patch @@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds when cancelling interaction. diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index d9ee5f7fd6a405547da0b162f11886d7b96dd622..0aa9b3a0d2aec8072fe32e43ed16946f22b29fab 100644 +index 8e5975a4871b99329c78379153ad64575d08d123..9b282a917e797a652b5ec10f1f9f550b6d82777f 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -148,6 +148,11 @@ public class PlayerInteractManager { diff --git a/Spigot-Server-Patches/0196-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0196-Disable-Explicit-Network-Manager-Flushing.patch index bc9548b65..7026e3114 100644 --- a/Spigot-Server-Patches/0196-Disable-Explicit-Network-Manager-Flushing.patch +++ b/Spigot-Server-Patches/0196-Disable-Explicit-Network-Manager-Flushing.patch @@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread. Renable flushing by passing -Dpaper.explicit-flush=true diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index aeee6bfbc1c0113beef35bf33e8c6928a1db2844..2fda6f6965916e99e603ff87af4226b5ab8417ee 100644 +index 1b11b4a8d26bd174b0c6f97225555eb585f67836..3351389dc122b66c198fb21ff02976491e9b46d9 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -63,6 +63,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { diff --git a/Spigot-Server-Patches/0200-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0200-Player.setPlayerProfile-API.patch index b34fc34eb..e098e770b 100644 --- a/Spigot-Server-Patches/0200-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0200-Player.setPlayerProfile-API.patch @@ -48,7 +48,7 @@ index b8642986f4304b48bf88c4a1d4ddfab1fbae175a..87dcb1688d1bf1221609a410c33a8d61 uniqueId = i.getId(); // Paper end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0ab5915d447b7a23deccb54763f54d09e83cf88e..1721f3c937450eacfcb48df482535e6cf1f24fe3 100644 +index 88da51fd414f0107ef0bbe5eea423c14275d6bc9..79db5b2c858f952b8bca089500dfd18db084f2e7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1256,8 +1256,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch index 0f46c0e80..11f1f3661 100644 --- a/Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch +++ b/Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch @@ -8,7 +8,7 @@ however, we should still migrate our configuration back upstream, to prevent unexpected situations diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 5fe6c36bdf8527d7fcb41e8d471194c7e395b946..29862494604ac1a0aaedd4ba84bc9d044fad9629 100644 +index 98686b6d660f14ea812b50fad423e513424983c2..1b845eb88c0cb7ae5797c8c6f6acc2178afb09d1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -271,4 +271,13 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch index be64e678d..8cad2d959 100644 --- a/Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch +++ b/Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch @@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs. provide an optional flag to disable this check, at your own risk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1721f3c937450eacfcb48df482535e6cf1f24fe3..df1896d447295123dbf7f8c8dea163be7849132f 100644 +index 79db5b2c858f952b8bca089500dfd18db084f2e7..c24a0c6bd72b4b2cbc2432d5e1651c3c396e4baf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -141,6 +141,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch index 58fb31315..bdcf36ded 100644 --- a/Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch +++ b/Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly() Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index f20283585464d54c4c5da294cf19261c2d258c97..c256fa48d64776ae7a7b21d42fb87c0a8ca7f3bc 100644 +index b9ede7d533a813f4de27404dc14b0ef99c8fcd62..1e7aa2ee1c399bf3484e0245d57ab428d48d32f5 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -224,6 +224,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { diff --git a/Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch index 56c8d0cae..d1be11dbf 100644 --- a/Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle. This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9040385c68db1dc004b5ce6cc62300e7da85073e..fde791f4b1d80d3dab7d5a91d644295a80297f34 100644 +index 8e005ead10a9ac738b0e626239926bbf30e16695..78e99f072304fbddec95fed488b4b14743bd1252 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -61,7 +61,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -22,7 +22,7 @@ index 9040385c68db1dc004b5ce6cc62300e7da85073e..fde791f4b1d80d3dab7d5a91d644295a public final ChunkProviderServer chunkProvider; // Paper - public boolean tickingEntities; private final MinecraftServer server; -@@ -1355,12 +1355,17 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1357,12 +1357,17 @@ public class WorldServer extends World implements GeneratorAccessSeed { } public int sendParticles(EntityPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) { diff --git a/Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch index 42ae3cd79..d08b2f1ca 100644 --- a/Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch +++ b/Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch @@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index c256fa48d64776ae7a7b21d42fb87c0a8ca7f3bc..d03c0b4ea5fad793a7bedad5ae3be0b779dc458c 100644 +index 1e7aa2ee1c399bf3484e0245d57ab428d48d32f5..f4b823882e1e842c897c7946f7d1a46ce5366de0 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -167,7 +167,15 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { diff --git a/Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch index 562f3d81d..8664d9973 100644 --- a/Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch +++ b/Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent Fires when a witch consumes the potion in their hand diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 43bc7f509b00b40c3fa7031546a52154c39b093d..4f2212ed9abb00e86c3d80d7facc7298f7a07b89 100644 +index fd54fbe9d331a8065ecfea90e54975b5d8e6368a..44a744f0af2de92c33a43eaaf7de6f027e1d4e29 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -85,7 +85,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { diff --git a/Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch index 09135fccf..a1eeb1447 100644 --- a/Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch +++ b/Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent Fired when a witch throws a potion at a player diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 4f2212ed9abb00e86c3d80d7facc7298f7a07b89..2e085e3c4021719eeaefa0a3323f03567e988c81 100644 +index 44a744f0af2de92c33a43eaaf7de6f027e1d4e29..58949acbcb69649366df16a0d55e822a039e4d9a 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { diff --git a/Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch index 0b0c088d2..34d7fe161 100644 --- a/Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch +++ b/Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] WitchReadyPotionEvent diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 2e085e3c4021719eeaefa0a3323f03567e988c81..fc58cce8455dcf244355189fabb1a76114c19368 100644 +index 58949acbcb69649366df16a0d55e822a039e4d9a..0703124e5137ff0a5ae4d025488eb343d2813067 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -118,7 +118,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { diff --git a/Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch index e5691e15d..e38723592 100644 --- a/Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement EntityTeleportEndGatewayEvent diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index 717c736cbc4defd24c5d08b501227bbd3e00a7e8..8eb1520d603aa59650418ee12cb1031168271fea 100644 +index 6a0f7b02c5a2663bb7304a1f8c6cbf1603507d45..5550fd9ea6bcae07dcdf431322cb0da0b26a6d71 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -168,9 +168,20 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick diff --git a/Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch index 2a9b4bae7..e2d20dc75 100644 --- a/Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch +++ b/Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event Otherwise the creeper infinite explodes diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 749c6e21cbd01a81196476728def640ba46a5783..055272e49ff522a009fcd335e2183172ada11c35 100644 +index 7b9188a33c079155a7ff5b0e5de854550324f0f1..647795bc7ea68f9dbe9d3f6488eaec82159feb9f 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster { diff --git a/Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch index 7a429129c..c3f2946af 100644 --- a/Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch +++ b/Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch @@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas. I would love to see this change in Vanilla, so Mojang please pull :) diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 29862494604ac1a0aaedd4ba84bc9d044fad9629..b3309e97d14e82a6bd8d05a326e7bb4bdb88500a 100644 +index 1b845eb88c0cb7ae5797c8c6f6acc2178afb09d1..ca90b768b758b9fc074daf592e2140e60a9b8841 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -280,4 +280,12 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch index 353a864c7..92b60883d 100644 --- a/Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch +++ b/Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Print Error details when failing to save player data diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index af9e94a87a946a4a9e2579a87f3f5a7adeb66f25..859d604cf9bf72aff261af39eec495959a9ac04b 100644 +index 6a9e0e644801ddc5f18a47d15d5f6d5b6dc13004..b5cf60495b85c6ae6c32ee8a1c65d80e59fdce3d 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -36,7 +36,7 @@ public class WorldNBTStorage { diff --git a/Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch b/Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch index ff0ef0f9b..1ac847e79 100644 --- a/Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch +++ b/Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Improve EntityShootBowEvent Adds missing call to Illagers and also adds Arrow ItemStack to skeltons diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java -index 435b755fdcfa64b4f8c4167e375d59e3ac8f23fb..ff8efca2616cb14d9e79e03e3d08781d2547b8eb 100644 +index b00a18643ea8425c5008a25563dbaa17d1a82ca4..50442b3a498d1bab4270e69952a79f5182153ece 100644 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java @@ -134,8 +134,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan @@ -30,7 +30,7 @@ index 435b755fdcfa64b4f8c4167e375d59e3ac8f23fb..ff8efca2616cb14d9e79e03e3d08781d class a extends EntityIllagerWizard.PathfinderGoalCastSpell { diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java -index ac013d55c5df502d8a8cdf18237a0ca956a444c4..513bb3087ea8e81d36dcc8f78e22b6c63b26f582 100644 +index 48c7ba6ecc4ab42805363e31d0864fb685c8d3ca..ced89af70ca791bfe42c4e2d21604997a0cf3e0f 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java @@ -155,7 +155,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR diff --git a/Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch index 1f9af570a..eede52602 100644 --- a/Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch +++ b/Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch @@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use. Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 9a55d1e6f4c6632c1f27d8c1fac55abc3c3d8204..85d2f4bab52cef2822fb0431c9cf7b7becbd5ee7 100644 +index d340ec2fed8a4308d1fd2e998e6716e42d84fb98..bd031108edadd98050bcfe5bc9f702600bde266b 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2044,6 +2044,17 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch index 385012884..48859ce70 100644 --- a/Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch +++ b/Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent This event is called when an entity receives knockback by another entity. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 85d2f4bab52cef2822fb0431c9cf7b7becbd5ee7..0f7e162b342ac589dc357508a1dcd1ab02d1fe3e 100644 +index bd031108edadd98050bcfe5bc9f702600bde266b..cbffebfe323ff4ddec792c49ebc3391fc9ac35ac 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1080,7 +1080,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -28,7 +28,7 @@ index 85d2f4bab52cef2822fb0431c9cf7b7becbd5ee7..0f7e162b342ac589dc357508a1dcd1ab // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index ab96dd1ac20998b6458ecf6f3fb6f5a2d5189eba..90c38aed8f546987e45b9fd3ae9aa11b2e1f2084 100644 +index 1b0c4234cf579b35f404c129c2c6d3266b670b09..38bf49da2cc6b2f7068462ea8b57cf3a76ae1779 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1500,7 +1500,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -41,7 +41,7 @@ index ab96dd1ac20998b6458ecf6f3fb6f5a2d5189eba..90c38aed8f546987e45b9fd3ae9aa11b } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 7175a1146fbad4aa91f898a45415432bc27976da..4c6c0b3b77b3cea9abf4a9e6dec4872201db7b7b 100644 +index 5ecb82078f884946e83a15b254196e39986b7424..a962f695f3f3508f8ce32f72a56990eb0e601589 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1240,7 +1240,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch index 320ceca9d..f721c4bf4 100644 --- a/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch @@ -34,7 +34,7 @@ index cbffebfe323ff4ddec792c49ebc3391fc9ac35ac..73a33eff97d26e5b3542d787344013e1 this.activeContainer = this.defaultContainer; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 73479cf9e88567bf167dd5bffe4df75d2a424230..d4c907fb4914d3ffc3c361af08cfd709d3a88558 100644 +index 26f81c1af1dda7d0a78ca5815bfaf825ba913efd..415f0d74748484db0a211187a74b5d0b51ffe1cd 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -415,7 +415,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -117,7 +117,7 @@ index 7dd7289941253991d0a2aa22f9b058c116c14e82..577deb210f6d95b7502905f6af16e2e9 this.player.o(); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 3fa1ea2958bec57d40b702bdbdc511d67b165d7e..129f4095cb98e1e4295b9a12105d06e239d96f6b 100644 +index 02479d398189f0956a6e2a8882f398e33853873e..020cd10518328b81495e44b816446c96bfe1bdcc 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -422,7 +422,7 @@ public abstract class PlayerList { @@ -130,10 +130,10 @@ index 3fa1ea2958bec57d40b702bdbdc511d67b165d7e..129f4095cb98e1e4295b9a12105d06e2 PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game"); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index fde791f4b1d80d3dab7d5a91d644295a80297f34..79d0f4eff913560d718132b50f63a79ff365938d 100644 +index 78e99f072304fbddec95fed488b4b14743bd1252..46de86d72ddee11026bef01098a5f3f31c6606cc 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1012,7 +1012,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1014,7 +1014,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { for (TileEntity tileentity : chunk.getTileEntities().values()) { if (tileentity instanceof IInventory) { for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((IInventory) tileentity).getViewers())) { @@ -142,7 +142,7 @@ index fde791f4b1d80d3dab7d5a91d644295a80297f34..79d0f4eff913560d718132b50f63a79f } } } -@@ -1070,7 +1070,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1072,7 +1072,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { // Spigot Start if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder) { for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) { diff --git a/Spigot-Server-Patches/0235-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0235-Vex-getSummoner-API.patch index dc9166e4c..bd97a8b93 100644 --- a/Spigot-Server-Patches/0235-Vex-getSummoner-API.patch +++ b/Spigot-Server-Patches/0235-Vex-getSummoner-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API Get's the NPC that summoned this Vex diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index d69beb58d805d442e346725020fe47582841000f..a8e9b1e83969f4e49465fc5e8b5fb8a5efe5f81d 100644 +index ffcb0e1bfbb196ddcbc144fa83d1525398970309..b84eb0394ab9a53e32b774682bc42b067625195e 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -89,6 +89,7 @@ public class EntityVex extends EntityMonster { diff --git a/Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch index 735a4cde9..14039f8d2 100644 --- a/Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch +++ b/Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't change the Entity Random seed for squids diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 6a436c6edb4f2f17bbb165ff6497c15e476d3317..03d707ed09e08baf3992b3f4a0cc7e42e412d16b 100644 +index 050c4bdac8519250157b77c3221c99bd49e53a22..b21605a62365fe24f315f35bd840b4740fc80f0e 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -21,7 +21,7 @@ public class EntitySquid extends EntityWaterAnimal { diff --git a/Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch index 51383d443..406da8626 100644 --- a/Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch +++ b/Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch @@ -8,10 +8,10 @@ These are a critical sign that somethin went wrong, and you've lost some data... We should kind of know about these things you know. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 79d0f4eff913560d718132b50f63a79ff365938d..caaebdba5ede1d41c97ea57ea1e9de9d0a977c95 100644 +index 46de86d72ddee11026bef01098a5f3f31c6606cc..6fc0ccc029fc9d1f11f4325792977a67fa89a6c9 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -965,7 +965,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -966,7 +966,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { if (entity1 == null) { return false; } else { diff --git a/Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch index 95a78b89a..6b6729148 100644 --- a/Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch +++ b/Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Avoid item merge if stack size above max stack size diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 6d9a03a1ccc78ae9eeb654dd7fab9f23fcce74b8..78a2e28c9fe93cdbb2a7326a5d6fcb596724ad30 100644 +index 7e1cc212e22f21bec1f6b1a2d337ef2ee70dc699..fde34e4c0c95d23a006304f26339a60ea6cf51fa 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -182,6 +182,10 @@ public class EntityItem extends Entity { diff --git a/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch index 7b18c2a96..58aaa9e72 100644 --- a/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch +++ b/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers diff --git a/pom.xml b/pom.xml -index e3630cd3847c6a5d5b3c8a37fe6f101f938b8700..c10888b862541e244c9c9c60d45ef9fee59ae3e8 100644 +index 0c7a485ae7c2fbb5aa4c892d75a314a75056ba9a..2349491a15393a450d80397dd92c5733b28a3482 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,13 @@ diff --git a/Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index b8a8a4ac9..98c37ef48 100644 --- a/Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -52,7 +52,7 @@ index cc17d9862ed6169c332896d81dc18209234cfa00..6003201197a89fa6c46c35d711a53db6 public boolean captureBlockStates = false; public boolean captureTreeGeneration = false; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index caaebdba5ede1d41c97ea57ea1e9de9d0a977c95..3655b3d48da865931507e8588830567ffef1cdac 100644 +index 6fc0ccc029fc9d1f11f4325792977a67fa89a6c9..47c49389d5f025003a0a9876cab5eb67cabec145 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -88,6 +88,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -65,7 +65,7 @@ index caaebdba5ede1d41c97ea57ea1e9de9d0a977c95..3655b3d48da865931507e8588830567f @Override public Chunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI return this.chunkProvider.getChunkAt(x, z, false); -@@ -926,8 +929,28 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -927,8 +930,28 @@ public class WorldServer extends World implements GeneratorAccessSeed { // CraftBukkit start private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) { org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot @@ -95,7 +95,7 @@ index caaebdba5ede1d41c97ea57ea1e9de9d0a977c95..3655b3d48da865931507e8588830567f // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit return false; } else if (this.isUUIDTaken(entity)) { -@@ -1124,7 +1147,24 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1126,7 +1149,24 @@ public class WorldServer extends World implements GeneratorAccessSeed { } } diff --git a/Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch index c7bb24e8c..d80eb7911 100644 --- a/Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java -index 2d3e498d5c40e573aad88fd0fce7943e930956ba..8ba7718b61ad9f6c8537b44265818ecbcffbfb63 100644 +index e0ae51ede44de5c894df526c1fc6d94c46d72013..8bcca73ae48ee822d32a6d23be2e1056a376e5f6 100644 --- a/src/main/java/net/minecraft/server/BlockBase.java +++ b/src/main/java/net/minecraft/server/BlockBase.java @@ -453,6 +453,7 @@ public abstract class BlockBase { @@ -17,7 +17,7 @@ index 2d3e498d5c40e573aad88fd0fce7943e930956ba..8ba7718b61ad9f6c8537b44265818ecb return this.getBlock().c(this.p(), iblockaccess, blockposition, voxelshapecollision); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d0e077084b84e44336878410aa9a44fed7408670..76ffbcec75fb1e22190179cf1f6ef7e417268ded 100644 +index c863fd94ee77b81aec84223588e20eed974515d6..02e4ce705c2a7a1cdc7024a6c3db799db8922ce9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -96,7 +96,7 @@ index ed0f9c5d29c4f88b7beee4b0ecdd7a56de2d7a9e..881cea7c466f29ff4a89db28d104e850 if (operatorboolean.apply(false, false)) { throw (IllegalArgumentException) SystemUtils.c((Throwable) (new IllegalArgumentException())); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 909e01e458d729f277797bf1dca564f927318460..4b28cb07e24a2deb18e2c7e97f25fee1d32e0d25 100644 +index 23a38825b71ea981538f32368705e7a7b98dadaf..514be9c4356380627032c54b4b1eda37aaefe16d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -178,6 +178,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -147,7 +147,7 @@ index 909e01e458d729f277797bf1dca564f927318460..4b28cb07e24a2deb18e2c7e97f25fee1 public boolean s_() { return this.isClientSide; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 0980c1f19340ac2bb044ff896f5ee6153c95bbd6..462cc4539c98787bb0c7e5925d8b6b06874120ca 100644 +index 52762d75edd35dd3bc9668e3f7a3c79be279b783..6458cd6823ea066588742f8105048001395e4dde 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1209,6 +1209,14 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch index 79858a731..237f1cf08 100644 --- a/Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch +++ b/Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch @@ -58,7 +58,7 @@ index edacc6da62593c94392f460cb6839ed5f8067dd4..18d55cea6258c7b59b79aec1bcdf3589 return; } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 76ffbcec75fb1e22190179cf1f6ef7e417268ded..ef375f3987c26d70ba3f88e53f458bdccb6fc1ae 100644 +index 02e4ce705c2a7a1cdc7024a6c3db799db8922ce9..29b24fd75f06501a814868d1fab85c9b818bd316 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch index acfb3783a..b6539e59d 100644 --- a/Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch +++ b/Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] SkeletonHorse Additions diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index 187c21efe4899f84666af4007f34b488e3e7f7d4..abbc12c8e0767cf70ae5558979f1e49e8e52dd5c 100644 +index bb23e313b236ceb81c60d62833dc6f5afee044eb..a53d335f3af9df80bec3f94f81fb5ff0e0e5ebb5 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { diff --git a/Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch index 74872c96f..63c7364d3 100644 --- a/Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch +++ b/Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch @@ -80,10 +80,10 @@ index d30c4d5a4ee83e21ba9269c0b92af2b72b85d3cc..3a292bccb2295bf7ae46fc3d7e5c9c63 public static ChunkStatus.Type a(@Nullable NBTTagCompound nbttagcompound) { if (nbttagcompound != null) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3655b3d48da865931507e8588830567ffef1cdac..254f2567f36ced5c4309ea2df7952772bb279390 100644 +index 47c49389d5f025003a0a9876cab5eb67cabec145..0d78071a1d91c0289992d84a3858102e56434356 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1044,6 +1044,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1046,6 +1046,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { List[] aentityslice = chunk.getEntitySlices(); // Spigot int i = aentityslice.length; @@ -91,7 +91,7 @@ index 3655b3d48da865931507e8588830567ffef1cdac..254f2567f36ced5c4309ea2df7952772 for (int j = 0; j < i; ++j) { List entityslice = aentityslice[j]; // Spigot Iterator iterator = entityslice.iterator(); -@@ -1056,11 +1057,25 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1058,11 +1059,25 @@ public class WorldServer extends World implements GeneratorAccessSeed { throw (IllegalStateException) SystemUtils.c((Throwable) (new IllegalStateException("Removing entity while ticking!"))); } diff --git a/Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch index 486296c7d..4b25cd95d 100644 --- a/Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -63,10 +63,10 @@ index 29b24fd75f06501a814868d1fab85c9b818bd316..b2cccdc9f2f243cd3fb1283ade0280b2 public float getBukkitYaw() { return this.yaw; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 254f2567f36ced5c4309ea2df7952772bb279390..38fd15bd2f3503eae0be0aa2c939b8c737368c24 100644 +index 0d78071a1d91c0289992d84a3858102e56434356..46624d1832eb76aed688da5e1cf6c7dc304d610b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1196,6 +1196,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1198,6 +1198,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { entity.origin = entity.getBukkitEntity().getLocation(); } // Paper end @@ -74,7 +74,7 @@ index 254f2567f36ced5c4309ea2df7952772bb279390..38fd15bd2f3503eae0be0aa2c939b8c7 new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid } -@@ -1208,6 +1209,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1210,6 +1211,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { this.removeEntityFromChunk(entity); this.entitiesById.remove(entity.getId()); this.unregisterEntity(entity); diff --git a/Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch index 3db98674c..165eff5ea 100644 --- a/Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch +++ b/Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 0330bdf46a3baba169dd226261094a18a6aecf54..554bf021f05165438ef4a0db75f9654b4d4b5480 100644 +index 2592a59e9506cee901802a3bdc78db8832700fd8..9b71e3207b0f41ab34871d5f4d7e87d90bc6446d 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -388,6 +388,7 @@ public class EntityArmorStand extends EntityLiving { diff --git a/Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch index 686f30f7f..943db52b7 100644 --- a/Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch @@ -115,7 +115,7 @@ index c6fe9c1f7ef06c4524533130b493ca5e72bd1693..7b601955f3fd36f06c838b896b455a60 world.a(blockposition, false); } diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 6ad63e5bb4b7bec976d1aef74547ff96f64204c6..8da02467dff4b9da644aa12e453d127b7a01e259 100644 +index ef9df3c7c7c455373641f7a7c701f82a23ffef36..6bd55433fafcfd8079b8e7b1ce6b65daa13b83c1 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock; diff --git a/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch index 3f849f0ec..beb7264c2 100644 --- a/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch @@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on plugins doing unsafe things. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index f3e906902a3a90fd023050ebfae7ebc6d50311eb..e8d6cc7c116faaf168efdb0af0b2365bb7fb6eac 100644 +index ca90b768b758b9fc074daf592e2140e60a9b8841..615ef87f4fa6a91febc6ce006b00c0ab705359b0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -288,4 +288,18 @@ public class PaperConfig { @@ -45,7 +45,7 @@ index f3e906902a3a90fd023050ebfae7ebc6d50311eb..e8d6cc7c116faaf168efdb0af0b2365b + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e025360ffdb54f91b2215076f24f9abb08d6718f..6e3d66ab776146e2204539319412ea8bde17d58a 100644 +index a62fcd57be08cce2aa51de078aa86e2eeb6f11e5..be2c94a8fb93ee024e035cc8557f230ee7c1c647 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -83,6 +83,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch index 3c8c9eb80..b65fb44af 100644 --- a/Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch @@ -95,10 +95,10 @@ index 514be9c4356380627032c54b4b1eda37aaefe16d..caeca1b5b6aafa5770924c3f9e0cc264 public boolean s_() { return this.isClientSide; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 38fd15bd2f3503eae0be0aa2c939b8c737368c24..458ee180fa1c8c105d596125398b2c34d8265d0a 100644 +index 46624d1832eb76aed688da5e1cf6c7dc304d610b..c8a990ab5db73b9e13b60b55f10142fe20e8179a 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1534,15 +1534,17 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1536,15 +1536,17 @@ public class WorldServer extends World implements GeneratorAccessSeed { this.getMinecraftServer().getPlayerList().sendAll(new PacketPlayOutSpawnPosition(blockposition, f)); } diff --git a/Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch index a2dd4567f..663592f28 100644 --- a/Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch +++ b/Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] MC-135506: Experience should save as Integers diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index a2eaea4bd847ebe0b3dc35c95c4c29d6c73f4797..e33a42dcd52ab1d027df542e044d84d42970559c 100644 +index 4df7df781d12e38885ecfbc89dd1d42d9de14248..c2be0c2bc315876f120cff207e5516dda2bd55d7 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -202,7 +202,7 @@ public class EntityExperienceOrb extends Entity { diff --git a/Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch index 28a37d6d7..77462a851 100644 --- a/Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch @@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash. This will help diagnose what was going on in that time before the crash. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 7e942ad5c6c582ad110fd4e76d5900556c318884..7eb15023ca5ffb065d641431af790f62b7efee11 100644 +index 615ef87f4fa6a91febc6ce006b00c0ab705359b0..d162a5f1c5bcd394897ab1bd1ac6d31454bc94b7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration; diff --git a/Spigot-Server-Patches/0275-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0275-Add-More-Creeper-API.patch index 7a61fd528..28271aacd 100644 --- a/Spigot-Server-Patches/0275-Add-More-Creeper-API.patch +++ b/Spigot-Server-Patches/0275-Add-More-Creeper-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 055272e49ff522a009fcd335e2183172ada11c35..ad422dfafbfcf62f6aa483dafa9764c274414d8d 100644 +index 647795bc7ea68f9dbe9d3f6488eaec82159feb9f..79ef955070b2982be79cc58e40093624bd088ff0 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster { diff --git a/Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch index f26e73420..bb888b1fe 100644 --- a/Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 3a6e5cb459fb9866cf2e377b803501152ab7ce69..f193c2778d0f04973546256d648692398b932dca 100644 +index 83d98b705875fa543de4f37b1234ad65e4e0604a..99dac0a315c29dd394ea3e8049da89c62ace65cc 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3474,6 +3474,23 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch index a4517e80e..6dd7b27c3 100644 --- a/Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch @@ -17,7 +17,7 @@ index 73a33eff97d26e5b3542d787344013e18e52db68..6a46b9262ba34febc2664a6f56c18684 return (float) (1.0D / this.b(GenericAttributes.ATTACK_SPEED) * 20.0D); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 18f0d23e38abb9c3e326a727cc4b4e040adb432d..982b8a7028385d38ff0bd88aabd94801ae258037 100644 +index 8092fba753f08b31edfd457960b8edc3578fb3ca..7976d943855e444746b9e6efca57bfefe28bb0b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1993,6 +1993,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0280-Improve-death-events.patch b/Spigot-Server-Patches/0280-Improve-death-events.patch index 050bf69f6..d8a66b29a 100644 --- a/Spigot-Server-Patches/0280-Improve-death-events.patch +++ b/Spigot-Server-Patches/0280-Improve-death-events.patch @@ -274,7 +274,7 @@ index 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9 return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index dd3ae707776626d54894d19d5b0968256104c4dd..08e2e911d726e9d306f5fcc7755ab89f94959aa3 100644 +index 415f0d74748484db0a211187a74b5d0b51ffe1cd..1e57e53c965a2e9335aa36926c44f7f3aa43af3c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -84,6 +84,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -352,7 +352,7 @@ index 9a2e6bedfc50fba10f37c01d825f80415bfb69d3..a4afe638515471159d505a5e402a9342 this.minecraftKey = minecraftKey; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 982b8a7028385d38ff0bd88aabd94801ae258037..6c3b9df31e9c44f7171cf08014561e4b095133b1 100644 +index 7976d943855e444746b9e6efca57bfefe28bb0b1..89553476d6dec092d04830c169b886d7868da3be 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1784,7 +1784,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch index a52dde881..e20e0c19b 100644 --- a/Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch +++ b/Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch @@ -153,7 +153,7 @@ index 0000000000000000000000000000000000000000..af1bac9680028130e99c5e7130f258c1 + } +} diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index d39ce9c1816aaa33478dcd623056488ca21411f3..81c88c6bf737945c6cbd659d2feaf3f763b7df73 100644 +index ee7b1f25ba8b6b4318e332b739359db6ddd58b62..64b991859f0f3ca7d932b8acc8aeed401e22a388 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -79,7 +79,7 @@ public abstract class NavigationAbstract { diff --git a/Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch index 6d9375d3f..415fcfeec 100644 --- a/Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch +++ b/Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Honor EntityAgeable.ageLock diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java -index 03f7979e34355842e405ec32c713ecc34c5a7a8b..026e75e5ae9e231e3f898823825adab30237d53d 100644 +index e56aabd8a59c29406ac0f8dfc2207526f6fa99aa..de48dc7cd1996f1a62ef1d0047b1182d7889bd38 100644 --- a/src/main/java/net/minecraft/server/EntityAgeable.java +++ b/src/main/java/net/minecraft/server/EntityAgeable.java @@ -73,6 +73,7 @@ public abstract class EntityAgeable extends EntityCreature { diff --git a/Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch index 5a8deff1e..0d971c54f 100644 --- a/Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch +++ b/Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection throttle kick message diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 7eb15023ca5ffb065d641431af790f62b7efee11..020b67be1952e7bed2363fe8e4e287ad82b77752 100644 +index d162a5f1c5bcd394897ab1bd1ac6d31454bc94b7..74a4593853707f5dccba597fa903e5f1194cd5c5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -273,6 +273,11 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch index 8501d294f..f0d34c350 100644 --- a/Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow setting the vex's summoner diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index a8e9b1e83969f4e49465fc5e8b5fb8a5efe5f81d..ae05856f25b092d193ec709ac6971c1089482242 100644 +index b84eb0394ab9a53e32b774682bc42b067625195e..ed6a47ad2fd973695fbb151d1a44000ec3639e54 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -130,6 +130,7 @@ public class EntityVex extends EntityMonster { diff --git a/Spigot-Server-Patches/0296-Turtle-API.patch b/Spigot-Server-Patches/0296-Turtle-API.patch index 36d5c793e..e614210f5 100644 --- a/Spigot-Server-Patches/0296-Turtle-API.patch +++ b/Spigot-Server-Patches/0296-Turtle-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Turtle API diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index a3dcb72c600034886137c24b22e64c54980c33f3..2ce40da2a8e28e80b4cb2cb827f45ddd4601d93a 100644 +index 19c92bea21ddcc3917eb011dcfe41006299356ef..fa8eab20bb839c53bf7989d02d2274f835002609 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -31,7 +31,7 @@ public class EntityTurtle extends EntityAnimal { diff --git a/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch index bb2b76ebb..dea8b3fcb 100644 --- a/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch +++ b/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch @@ -19,7 +19,7 @@ spectate the target entity. Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8da30fd037a91309b09a1ba55cc085364d292c1f..7d2d7a909dba9e741605774081a6d4b589c428d9 100644 +index 1e57e53c965a2e9335aa36926c44f7f3aa43af3c..b0f257cb35ff39d9dd6201235dc3ff5db8b85bd7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1663,15 +1663,59 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch index c353bbadd..b265413c3 100644 --- a/Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch @@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 9e10e2e965dd52755ee5ede71104cc89b11da45e..7b905c16e3833741966cce301b0f7639addac05e 100644 +index 74a4593853707f5dccba597fa903e5f1194cd5c5..ba7fdf482ef8536074fcc3867d7fc142fcfe8ce8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -8,6 +8,7 @@ import java.io.IOException; diff --git a/Spigot-Server-Patches/0300-Add-more-Witch-API.patch b/Spigot-Server-Patches/0300-Add-more-Witch-API.patch index 9a7ab1278..717dc7375 100644 --- a/Spigot-Server-Patches/0300-Add-more-Witch-API.patch +++ b/Spigot-Server-Patches/0300-Add-more-Witch-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add more Witch API diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index fc58cce8455dcf244355189fabb1a76114c19368..0ef981e5ad1c928fbcf32e83e28285e690df1775 100644 +index 0703124e5137ff0a5ae4d025488eb343d2813067..ca3c5150bcfe2a92b49ad5a27c23dd37a7054fbb 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -1,5 +1,11 @@ diff --git a/Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch index 7648bb575..04ed06de5 100644 --- a/Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch +++ b/Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Check Drowned for Villager Aggression Config diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 958bdb8ff25a1605ab7f99816bf80908b444a3fb..ea7934060d7b7c3ca1c7fdc303168377a59c21a3 100644 +index 9c507cb0810029e3c5d7cb1055da170469315596..9ae0897bfd6a4577901d9189d0dba22f3ec2110c 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -31,7 +31,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { diff --git a/Spigot-Server-Patches/0302-Here-s-Johnny.patch b/Spigot-Server-Patches/0302-Here-s-Johnny.patch index b621c44e5..08e83e408 100644 --- a/Spigot-Server-Patches/0302-Here-s-Johnny.patch +++ b/Spigot-Server-Patches/0302-Here-s-Johnny.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Here's Johnny! diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index a959006185afaa3306fdd228f52d8177b58286a7..fd34d88c0b64dea75b82a5b23a79b119eca22a4a 100644 +index b358070215477bcd33dcd440472db4489017135a..c0d26aa9dcd02c44d744b10e18609857ada95889 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract { diff --git a/Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch index 70838355b..bbc2dd015 100644 --- a/Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch @@ -17,7 +17,7 @@ index 4923fe299e7f057d5d70d346e83e746185eafdd3..470f8f1440c62b30a9df6cf356003dd3 return 300; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 0eb5d6a58a9794ed366d03b76f01abb673a6827c..f07014a563e2d472f02fc17d3bbf7d8c8a7f63f5 100644 +index b0f257cb35ff39d9dd6201235dc3ff5db8b85bd7..4ad9afc9806fc58ef3044371dcd64eb3d86ecf4d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -2005,6 +2005,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch index d95cf29d6..c19f14f9d 100644 --- a/Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch +++ b/Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch @@ -12,7 +12,7 @@ server threads Allow usage of a single thread executor by not using ForkJoin so single core CPU's. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f9608bf0eb4e3dfc573fe626e7da9fccf69dc783..e08f913403c3cf3e6efec6c6409f046600c9eb7f 100644 +index aea9e169f9a11378c176c0cc3ee5a0d59e6a4c38..354109e5f7a8e1b0895e12002951a4bd3bf7dd0c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -175,6 +175,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant, PlayerChunk.Failure>> completablefuture = this.a(chunkcoordintpair, 1, (i) -> { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 180f5690769076ee982f208cb610ce61f49c8487..83ec3c34bc2b063fe3ae7ba48e35b83522d9866b 100644 +index 8d220f165435f0c73552dc5e6c912aefbaf91ee1..de2bdd55213613f439cd797bfe01986c8851eaa4 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -4,6 +4,8 @@ import com.google.common.annotations.VisibleForTesting; @@ -209,7 +209,7 @@ index 180f5690769076ee982f208cb610ce61f49c8487..83ec3c34bc2b063fe3ae7ba48e35b835 import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Queues; -@@ -996,7 +998,22 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -997,7 +999,22 @@ public class WorldServer extends World implements GeneratorAccessSeed { if (entity1 == null) { return false; } else { diff --git a/Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch index dc91634ea..9d3f83731 100644 --- a/Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -102,10 +102,10 @@ index 3868572aed50c8bffd93727a139a3fbb8dc19688..ae77805f71c6c574d92f39c51b1e48f2 @Override public void a(ChunkCoordIntPair chunkcoordintpair) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 83ec3c34bc2b063fe3ae7ba48e35b83522d9866b..b2ef67642e2e0d0573f4312e88ba583352a743a6 100644 +index de2bdd55213613f439cd797bfe01986c8851eaa4..644167d400e0f4af142f0afe6a11cae4ac591ddf 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1550,12 +1550,88 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1552,12 +1552,88 @@ public class WorldServer extends World implements GeneratorAccessSeed { return ((PersistentIdCounts) this.getMinecraftServer().E().getWorldPersistentData().a(PersistentIdCounts::new, "idcounts")).a(); } diff --git a/Spigot-Server-Patches/0362-incremental-chunk-saving.patch b/Spigot-Server-Patches/0362-incremental-chunk-saving.patch index 82a2bdf93..313ca162f 100644 --- a/Spigot-Server-Patches/0362-incremental-chunk-saving.patch +++ b/Spigot-Server-Patches/0362-incremental-chunk-saving.patch @@ -265,10 +265,10 @@ index d8bedba819fa9ee0a4d3bdfbf0b010da7144dd68..c4ed4d58f7b344626acb13baeb142889 return PlayerChunk.getChunkState(playerchunk.getTicketLevel()); }); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index b2ef67642e2e0d0573f4312e88ba583352a743a6..5a35395434ffdefd410573302a3d46cca9642a81 100644 +index 644167d400e0f4af142f0afe6a11cae4ac591ddf..3c7752769fb6a2da644f9d41ef783de9772ce5f7 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -775,11 +775,43 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -776,11 +776,43 @@ public class WorldServer extends World implements GeneratorAccessSeed { return !this.server.a(this, blockposition, entityhuman) && this.getWorldBorder().a(blockposition); } @@ -313,7 +313,7 @@ index b2ef67642e2e0d0573f4312e88ba583352a743a6..5a35395434ffdefd410573302a3d46cc try (co.aikar.timings.Timing ignored = timings.worldSave.startTiming()) { // Paper if (iprogressupdate != null) { iprogressupdate.a(new ChatMessage("menu.savingLevel")); -@@ -805,6 +837,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -806,6 +838,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { // CraftBukkit end } diff --git a/Spigot-Server-Patches/0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch index b6f549331..59a99537f 100644 --- a/Spigot-Server-Patches/0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch +++ b/Spigot-Server-Patches/0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Mark entities as being ticked when notifying navigation diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6b52f9b9adce975cdafaf12b2a1bea5ef1bbaaa4..7e377ecf8ae5348d889ba8c6b586ab4da6fd8cc1 100644 +index 1ad867b6b8c743ab03a3c0c1a75fc92e548b5a64..ccb37f6828fe2edb9358c93daa9f67edeef1f920 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1362,6 +1362,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1364,6 +1364,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { VoxelShape voxelshape1 = iblockdata1.getCollisionShape(this, blockposition); if (VoxelShapes.c(voxelshape, voxelshape1, OperatorBoolean.NOT_SAME)) { @@ -16,7 +16,7 @@ index 6b52f9b9adce975cdafaf12b2a1bea5ef1bbaaa4..7e377ecf8ae5348d889ba8c6b586ab4d Iterator iterator = this.navigators.iterator(); while (iterator.hasNext()) { -@@ -1372,6 +1373,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1374,6 +1375,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { } } diff --git a/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch index 3750b411d..2aff4549e 100644 --- a/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch @@ -199,7 +199,7 @@ index 9ead9b1ea1fafaa3d684c17efbae747386b7c587..9b8b49be032d7ceebcea8d7b98f999ed doChunkInfo(sender, args); break; diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 3c034d0354bbc3cb7bd68d499ed01b96f79eeeb8..0f4b4b26bda48084dacff2bf79cc6df288405607 100644 +index 346da105776a0ae0cb06ed69f1f8f9160695bb85..0fcabd12408a8209da5cb3332e217f98983aec02 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -1,5 +1,6 @@ @@ -3910,7 +3910,7 @@ index d6aca683465c6898536507fab9e6888fef2e77e5..b926cebd053bef829517c9d9bbf1c609 HAS_SPACE(VillagePlaceRecord::d), IS_OCCUPIED(VillagePlaceRecord::e), ANY((villageplacerecord) -> { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7e377ecf8ae5348d889ba8c6b586ab4da6fd8cc1..5a85c5b99179ffe4cfbd994b4c75f6dffaed110f 100644 +index ccb37f6828fe2edb9358c93daa9f67edeef1f920..a999683d6d16d3704c76b1af95255ad3c02a9fc2 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -98,6 +98,79 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -4002,7 +4002,7 @@ index 7e377ecf8ae5348d889ba8c6b586ab4da6fd8cc1..5a85c5b99179ffe4cfbd994b4c75f6df } // CraftBukkit start -@@ -1619,7 +1694,10 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1621,7 +1696,10 @@ public class WorldServer extends World implements GeneratorAccessSeed { } MCUtil.getSpiralOutChunks(spawn, radiusInBlocks >> 4).forEach(pair -> { diff --git a/Spigot-Server-Patches/0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch index eb6e4b0a1..300f5153d 100644 --- a/Spigot-Server-Patches/0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch +++ b/Spigot-Server-Patches/0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch @@ -7,7 +7,7 @@ If the Bukkit generator already has a spawn, use it immediately instead of spending time generating one that we won't use diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 23d700d055b0c80a412be349ed1c877792187eb8..62b28103f26377a71c61d9282ac65de05286adca 100644 +index 416658a2ddfb11c4a6929807b4e9d8bd8f708e2d..bf3da57c1e709acb3fa9243fb3bb6eaf0613f145 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -509,12 +509,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { +@@ -281,6 +281,7 @@ public class EntityTypes { return this.bl; } @@ -656,7 +656,7 @@ index e7d9674e25c06090d57bba6c8229bc3b75cb67e6..70a291090f022ff7d79a75b94ac54b94 private static double a(ChunkCoordIntPair chunkcoordintpair, Entity entity) { diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 99d4d6b4bdedcba7964ddc99467b8f8e5229b98a..beaea041dc47635411542fe9d06690809e03bf9e 100644 +index 979988c3c39afd80ce0b99a65dff5618a69ab600..6c15409982fd8005fede7c56c1ca74db5993d548 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -29,6 +29,11 @@ public final class SpawnerCreature { @@ -774,10 +774,10 @@ index 99d4d6b4bdedcba7964ddc99467b8f8e5229b98a..beaea041dc47635411542fe9d0669080 } entityinsentient.setPositionRotation(d0, (double) i, d1, worldserver.random.nextFloat() * 360.0F, 0.0F); -@@ -210,13 +252,18 @@ public final class SpawnerCreature { - groupdataentity = entityinsentient.prepare(worldserver, worldserver.getDamageScaler(entityinsentient.getChunkCoordinates()), EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null); +@@ -211,13 +253,18 @@ public final class SpawnerCreature { // CraftBukkit start - if (worldserver.addAllEntities(entityinsentient, SpawnReason.NATURAL)) { + worldserver.addAllEntities(entityinsentient, SpawnReason.NATURAL); + if (!entityinsentient.dead) { - ++j; + ++j; // Paper - force diff on name change - we expect this to be the total amount spawned ++k1; @@ -796,7 +796,7 @@ index 99d4d6b4bdedcba7964ddc99467b8f8e5229b98a..beaea041dc47635411542fe9d0669080 } if (entityinsentient.c(k1)) { -@@ -238,6 +285,7 @@ public final class SpawnerCreature { +@@ -239,6 +286,7 @@ public final class SpawnerCreature { } } @@ -804,7 +804,7 @@ index 99d4d6b4bdedcba7964ddc99467b8f8e5229b98a..beaea041dc47635411542fe9d0669080 } private static boolean a(WorldServer worldserver, IChunkAccess ichunkaccess, BlockPosition.MutableBlockPosition blockposition_mutableblockposition, double d0) { -@@ -478,8 +526,8 @@ public final class SpawnerCreature { +@@ -479,8 +527,8 @@ public final class SpawnerCreature { public static class d { @@ -815,7 +815,7 @@ index 99d4d6b4bdedcba7964ddc99467b8f8e5229b98a..beaea041dc47635411542fe9d0669080 private final SpawnerCreatureProbabilities c; private final Object2IntMap d; @Nullable -@@ -540,7 +588,7 @@ public final class SpawnerCreature { +@@ -541,7 +589,7 @@ public final class SpawnerCreature { // CraftBukkit start private boolean a(EnumCreatureType enumcreaturetype, int limit) { diff --git a/Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch index a6b4675a6..2ca9921da 100644 --- a/Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ b/Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index bb79467c6bb0ed44057802dde6cd40fa81c8d4fd..ee53d2cf4cf893911d851a3a011861b020799ba3 100644 +index e3f271a82f188f16ec249148fb4fb2af746d20ae..c5f9e6beb06219fe4d085e6c5adb0a4e4c934740 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -946,6 +946,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch index 738aadd99..12356426f 100644 --- a/Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch +++ b/Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index ee53d2cf4cf893911d851a3a011861b020799ba3..d1be6ef1a04c8bc98929421e73c0712086f147d5 100644 +index c5f9e6beb06219fe4d085e6c5adb0a4e4c934740..43bc279106e8097c345a4c959d65db6fdad16939 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -695,7 +695,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0402-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0402-Entity-Activation-Range-2.0.patch index 8fc14929e..044b6a583 100644 --- a/Spigot-Server-Patches/0402-Entity-Activation-Range-2.0.patch +++ b/Spigot-Server-Patches/0402-Entity-Activation-Range-2.0.patch @@ -351,7 +351,7 @@ index f74a062f89a58942ce821f25dec2da46c31bb2a8..f229fb7409e509878af1dca1ecda058f public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f79f04cd4d0c1f3518cbd08960206b06f9b819f6..7048f1e79380f2d36c944a125eea139a96cd91c9 100644 +index a06a9c4a50acdad951da3a95d0c46cf9766164c1..c345729675c76c5cd02a469283ed668a2df52816 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -747,17 +747,17 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -414,13 +414,14 @@ index f79f04cd4d0c1f3518cbd08960206b06f9b819f6..7048f1e79380f2d36c944a125eea139a entity1.g(entity1.locX(), entity1.locY(), entity1.locZ()); entity1.lastYaw = entity1.yaw; entity1.lastPitch = entity1.pitch; -@@ -805,7 +814,16 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -805,8 +814,17 @@ public class WorldServer extends World implements GeneratorAccessSeed { return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString(); }); gameprofilerfiller.c("tickPassenger"); + // Paper start - EAR 2 + if (isActive) { entity1.passengerTick(); + entity1.postTick(); // CraftBukkit + } else { + entity1.setMot(Vec3D.ORIGIN); + entity1.inactiveTick(); @@ -431,7 +432,7 @@ index f79f04cd4d0c1f3518cbd08960206b06f9b819f6..7048f1e79380f2d36c944a125eea139a gameprofilerfiller.exit(); } -@@ -818,7 +836,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -819,7 +837,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { this.a(entity1, entity2); } diff --git a/Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch index 80bd2da98..22479f6f0 100644 --- a/Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch +++ b/Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch @@ -398,7 +398,7 @@ index d4d5bc19e167a5271f8eb8d010f8a52b23b942df..859e31c63f94bdc7729c6d475990750b }); private final int[] b = new int[256]; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 63b0cc9d355d0a8e578514cc14ffe7729023c22c..60b018fb6865a4b73f944cffd79e7d246636360b 100644 +index 7edc7bfe804a9b450d5873444923d26ffaa96ba0..e57bda6223966171f15e0c6c24680a54c0edd83d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -106,7 +106,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant entitytypes = entity.getEntityType(); int i = entitytypes.getChunkRange() * 16; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 22b447ff847ea5bf9237fa738c25db4f84295133..ca4317d90bb5885ad2b1714e4c4e99902a9c23f6 100644 +index 5cb27e78ec27b131ea2790bb0aceca5b27fbf5b6..ed13a1bc54cebebbafbf9a3822d2942fbc09249e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1415,7 +1415,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1417,7 +1417,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { } } @@ -38,7 +38,7 @@ index 22b447ff847ea5bf9237fa738c25db4f84295133..ca4317d90bb5885ad2b1714e4c4e9990 // CraftBukkit start - SPIGOT-5278 if (entity instanceof EntityDrowned) { this.navigators.add(((EntityDrowned) entity).navigationWater); -@@ -1426,6 +1426,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1428,6 +1428,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { this.navigators.add(((EntityInsentient) entity).getNavigation()); } entity.valid = true; // CraftBukkit diff --git a/Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch index bb318acf2..1d4205ccb 100644 --- a/Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch +++ b/Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 371063fb37a354a4c23601aa2ba787dd65380ce4..f238ac3a57815539b6913a026e0e2e1bdba7ae84 100644 +index 19ef065f97b0e01cafde2cff9d0b0874030a8a24..9b13be3be5c911a00f2278f05557795cd916054d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -476,7 +476,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch index 16ce345d3..a1921da31 100644 --- a/Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch +++ b/Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch @@ -42,7 +42,7 @@ index 11fe3524f38f7756ebd0e3807678e8848fd2217d..884b59d478aa7de49906520e77866a79 public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions"); public static final Timing connectionTimer = Timings.ofSafe("Connection Handler"); diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 2901236b1c6bd5d27c9d40f9e5b3756144e14faa..56b32e2319c5f89d12c0ca4ea0211c6d7cbb366f 100644 +index 9b1845024d16a7875ba3406da92efb003f58f8cb..01d7ad6778d4bbef6e07f7529f40dd9da6cd2ea8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -405,4 +405,9 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch index 6197d8718..f8f6bed3f 100644 --- a/Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch +++ b/Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch @@ -10,7 +10,7 @@ larger than the keep loaded range. By skipping this, we avoid potential for a large spike on server start. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index f238ac3a57815539b6913a026e0e2e1bdba7ae84..a46f8573467f8a64a76532237072094460491938 100644 +index 9b13be3be5c911a00f2278f05557795cd916054d..dde0e9f1911d34791c7d7396f82cff5f82eec253 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -122,7 +122,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch index d4a877bd1..04fe85791 100644 --- a/Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch +++ b/Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch @@ -75,7 +75,7 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 56b32e2319c5f89d12c0ca4ea0211c6d7cbb366f..273ed1c5537a69256f1020646f5cd0c13d50f170 100644 +index 01d7ad6778d4bbef6e07f7529f40dd9da6cd2ea8..6f0c5a2d33001f59e560ec239c0edbd32de84ed8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -69,6 +69,7 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0443-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0443-Prevent-opening-inventories-when-frozen.patch index a5fe9795a..81a4ed570 100644 --- a/Spigot-Server-Patches/0443-Prevent-opening-inventories-when-frozen.patch +++ b/Spigot-Server-Patches/0443-Prevent-opening-inventories-when-frozen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a46f8573467f8a64a76532237072094460491938..7a791f5ea0ecb98f8b4509f79538d3f1e55703f6 100644 +index dde0e9f1911d34791c7d7396f82cff5f82eec253..5a7a065fdf49c0cfa49afb6c78da7cca81eff708 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -427,7 +427,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch index 74d6e4c2d..c84c2084c 100644 --- a/Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch +++ b/Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch @@ -98,7 +98,7 @@ index 7c0d381926e5ce59ded474c65b50016d4a7feab1..caaa01b20e5b7430b809477022f8ab35 protected static final DataWatcherObject bk = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p); protected static final DataWatcherObject bl = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 7a791f5ea0ecb98f8b4509f79538d3f1e55703f6..8a68f9aec04ad99632a4c81659834a9b9b433bd8 100644 +index 5a7a065fdf49c0cfa49afb6c78da7cca81eff708..e07e2f06e47ed74c761d6353d5f59706971f3fb7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -149,7 +149,7 @@ index dbc3552d50c4129e1844c8a379ab5ba396645f52..87ec3987d4b6de836016e91ef90383e3 return this.e; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b5088ad2eeef0a3fae0acb3dfea7605b9a861c73..3c24c1cc5045fbf794e605a5dd5473d8bf8e6542 100644 +index fa4f2df4a669df838e5c553a21b9291ed7d6b32f..a4c112844ce99e770d8ad2df5a096be39897c4ce 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,8 @@ diff --git a/Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index e0ac4d6af..e5b06cff9 100644 --- a/Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick delays anymore. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8a68f9aec04ad99632a4c81659834a9b9b433bd8..c2a6abcde6aad90c7d6d7989b8bbc811b79b3d22 100644 +index e07e2f06e47ed74c761d6353d5f59706971f3fb7..b8d8368a18acca06be58c2e146d440cfffab2de9 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -108,6 +108,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch index 0d1d35374..ac0117119 100644 --- a/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch +++ b/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch @@ -31,7 +31,7 @@ index 2762215b2cdbeb2ea77dbd1dccecaa770a5b94c8..dc9b371af6c21510e9efba31ad462968 public void d(Vec3D vec3d) { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index c2a6abcde6aad90c7d6d7989b8bbc811b79b3d22..052f209d18818bcd5fa07c0026bcb922de2e78ba 100644 +index b8d8368a18acca06be58c2e146d440cfffab2de9..b307fca8c4b91f0bf260497bc425f2f10540e36d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -44,6 +44,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -73,7 +73,7 @@ index 0b1baeab3075a741519c6875f7b4847ce6cad8fc..efb59a7409902aa3c4bf95337683346a if (entityplayer != null) { this.g = LoginListener.EnumProtocolState.DELAY_ACCEPT; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 93877b45f380e57f2dc9656463e333ef422a4b95..a3dad0e380736fa64b50553ffbadf0cf2dac015d 100644 +index 9b58dd080f318a2d197a6f60d40a48b728867b91..88a887f23fd5fc1acd03c1ef3a16a5b73b9c10d1 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch index 7d4a513cf..1887c69e6 100644 --- a/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch +++ b/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch @@ -69,7 +69,7 @@ index 54a1988341a4a6e80ab40624280b7c92532d5db6..7073d697a5d35b9b72ea05d5608438ac public boolean hasPermission(int i) { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a3dad0e380736fa64b50553ffbadf0cf2dac015d..3b7efa4ca3903ef980c5693efa8ab45a04b29652 100644 +index 88a887f23fd5fc1acd03c1ef3a16a5b73b9c10d1..9a7a1ebc7b0d4b013575da622ee149249d39590c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -622,8 +622,12 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch index f8fe34067..67c465baa 100644 --- a/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3b7efa4ca3903ef980c5693efa8ab45a04b29652..033578cb5f2be7db6c03c37dcdf1e353a0441d68 100644 +index 9a7a1ebc7b0d4b013575da622ee149249d39590c..37b7925b0c6dea0920d67cacf3b1982e8034e202 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -735,7 +735,14 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch index 1c1a35e88..c37c1edc0 100644 --- a/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch +++ b/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch @@ -148,7 +148,7 @@ index 4e50ef38700918a0efb2c67f5acf98eb66fd8335..b4d8657d37b2a6c02e886ec6de243634 } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 052f209d18818bcd5fa07c0026bcb922de2e78ba..a70721a051f524862003b9fb1dda79cf9ad64db0 100644 +index b307fca8c4b91f0bf260497bc425f2f10540e36d..38b80b72a583b5d99ad9768d41a4ecfb504fb5f2 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -117,6 +117,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch index 0823cc485..c35e40dfb 100644 --- a/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch +++ b/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch @@ -124,7 +124,7 @@ index ef61f8e784b7ebd26293d627e8b8e1aef1be6e21..03b1a67aaf3ed75b7669a3157847affd if (flag1) { ChunkMapDistance.this.j.a(ChunkTaskQueueSorter.a(() -> { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 4a927cb12b6dc9352550717d1128cb6b9080b8a7..563b5f10649a165180f7f39ff8bce4c79508ae97 100644 +index 38b80b72a583b5d99ad9768d41a4ecfb504fb5f2..59554edff841a09e74465ff1101d09d049ea9b7e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -119,6 +119,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch index 81c6b36d5..dea77c739 100644 --- a/Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch +++ b/Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch @@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let them destroy the worlds End Portals and get on top of the nether easy. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 273ed1c5537a69256f1020646f5cd0c13d50f170..e750aedfad992635019d1abd7c880f4829b1e41d 100644 +index 6f0c5a2d33001f59e560ec239c0edbd32de84ed8..ac6b291c103c432fdced603674345096326a9efe 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -411,4 +411,17 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch index 8dbbd4967..e4d87154e 100644 --- a/Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch +++ b/Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option for console having all permissions diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index e750aedfad992635019d1abd7c880f4829b1e41d..d393e37f50e2815da6b486ff0c3e277fa3413f3e 100644 +index ac6b291c103c432fdced603674345096326a9efe..7e577b889738a5d0b3e5be66d9266cdf01c70b1d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -424,4 +424,9 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch index e53ddf920..cfe333220 100644 --- a/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch +++ b/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch @@ -569,7 +569,7 @@ index b4d8657d37b2a6c02e886ec6de243634d1c08d51..4b45a2bf926c26eddc7d81c233ab6187 boolean flag1 = this.playerChunkMap.b(); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 563b5f10649a165180f7f39ff8bce4c79508ae97..b5aed60f7e5a8a74033700e40a4ccc3d99a9ad3e 100644 +index 59554edff841a09e74465ff1101d09d049ea9b7e..66920fa15720976a84a33ce498b8ca6f5ad5dee3 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -56,6 +56,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch index cedc5efb3..b70c92bca 100644 --- a/Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch +++ b/Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch @@ -32,7 +32,7 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840 This patch also fixes rail duping and carpet duping. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index d393e37f50e2815da6b486ff0c3e277fa3413f3e..53b62057a3edc3c211c4bade3a01fb065a523fcf 100644 +index 7e577b889738a5d0b3e5be66d9266cdf01c70b1d..fc03df234fc641f72b4d4a79535860300006ff50 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -429,4 +429,10 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch index a70ec155f..e04466e93 100644 --- a/Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch +++ b/Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch @@ -31,7 +31,7 @@ index 7e13b1cf6d92c3e0f2dab1ba1d42bd4f250e256c..3820acd65f3cd488dba964e6d9c45885 } else { if (entityhuman.getWorld().isClientSide) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index d391ca12bc3de506cc4485e4d207f04033ca0b94..bf052016d7ca4d2012bafe86909f4d581498d403 100644 +index 623ec94e5d3cdd67313510b41cbcbd609d067426..d01950720cb769ad13713812abee32d05edfa46d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -650,7 +650,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0541-Incremental-player-saving.patch b/Spigot-Server-Patches/0541-Incremental-player-saving.patch index ab61e3de0..c4321481e 100644 --- a/Spigot-Server-Patches/0541-Incremental-player-saving.patch +++ b/Spigot-Server-Patches/0541-Incremental-player-saving.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Incremental player saving diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 53b62057a3edc3c211c4bade3a01fb065a523fcf..669653b5cfb057b277e509b630fd73a843b42b24 100644 +index fc03df234fc641f72b4d4a79535860300006ff50..d86474a1a97597c14ea8a28444e2a5d82fcda2a7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -435,4 +435,15 @@ public class PaperConfig { @@ -25,7 +25,7 @@ index 53b62057a3edc3c211c4bade3a01fb065a523fcf..669653b5cfb057b277e509b630fd73a8 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b5aed60f7e5a8a74033700e40a4ccc3d99a9ad3e..56677b8bf45af217c0a4a50fc7aea76ca012cbd7 100644 +index 66920fa15720976a84a33ce498b8ca6f5ad5dee3..59d47a9f75450573b26b82b6f432af7bdc46a783 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -43,6 +43,7 @@ import org.bukkit.inventory.MainHand; diff --git a/Spigot-Server-Patches/0546-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch b/Spigot-Server-Patches/0546-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch deleted file mode 100644 index 5a871f93e..000000000 --- a/Spigot-Server-Patches/0546-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sat, 15 Aug 2020 09:32:00 -0500 -Subject: [PATCH] Fix incorrect return for WorldServer#addAllEntitiesSafely - - -diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 1642bb724032530f6ecbc849f449b93e7c450873..d3a6247d6c8e566be11b8b2a3520b001fbdc2d42 100644 ---- a/src/main/java/net/minecraft/server/WorldServer.java -+++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1261,7 +1261,11 @@ public class WorldServer extends World implements GeneratorAccessSeed { - if (entity.cp().anyMatch(this::isUUIDTaken)) { - return false; - } else { -- return this.addAllEntities(entity, reason); // CraftBukkit -+ // Paper start - this method is _only_ designed to return false on duplicate uuids -+ // fixes issues with things such as a plugin cancelling spawn of a /summon -+ this.addAllEntities(entity, reason); // CraftBukkit -+ return true; -+ // Paper end - } - } - diff --git a/Spigot-Server-Patches/0547-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from Spigot-Server-Patches/0547-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to Spigot-Server-Patches/0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/Spigot-Server-Patches/0548-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0547-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from Spigot-Server-Patches/0548-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to Spigot-Server-Patches/0547-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/Spigot-Server-Patches/0549-Brand-support.patch b/Spigot-Server-Patches/0548-Brand-support.patch similarity index 100% rename from Spigot-Server-Patches/0549-Brand-support.patch rename to Spigot-Server-Patches/0548-Brand-support.patch diff --git a/Spigot-Server-Patches/0550-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch similarity index 100% rename from Spigot-Server-Patches/0550-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch rename to Spigot-Server-Patches/0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch diff --git a/Spigot-Server-Patches/0551-Fix-MC-197271.patch b/Spigot-Server-Patches/0550-Fix-MC-197271.patch similarity index 100% rename from Spigot-Server-Patches/0551-Fix-MC-197271.patch rename to Spigot-Server-Patches/0550-Fix-MC-197271.patch diff --git a/Spigot-Server-Patches/0552-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0551-MC-197883-Bandaid-decode-issue.patch similarity index 100% rename from Spigot-Server-Patches/0552-MC-197883-Bandaid-decode-issue.patch rename to Spigot-Server-Patches/0551-MC-197883-Bandaid-decode-issue.patch diff --git a/Spigot-Server-Patches/0553-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch similarity index 94% rename from Spigot-Server-Patches/0553-Add-setMaxPlayers-API.patch rename to Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch index 2e738f647..e9cbd128b 100644 --- a/Spigot-Server-Patches/0553-Add-setMaxPlayers-API.patch +++ b/Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index eb247855f880049e85372ea8dfcc2bf10d756835..38f26e25cb7d022c0bec5a5928db70611a0d347a 100644 +index ad6207dfb9b524b6d85bf8d904527db04672661d..dc3df171a6eb11f13272303951fb59a14d7df202 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -67,7 +67,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0554-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0553-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from Spigot-Server-Patches/0554-Add-playPickupItemAnimation-to-LivingEntity.patch rename to Spigot-Server-Patches/0553-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/Spigot-Server-Patches/0555-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0554-Don-t-require-FACING-data.patch similarity index 100% rename from Spigot-Server-Patches/0555-Don-t-require-FACING-data.patch rename to Spigot-Server-Patches/0554-Don-t-require-FACING-data.patch diff --git a/Spigot-Server-Patches/0556-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 94% rename from Spigot-Server-Patches/0556-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to Spigot-Server-Patches/0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index 135ce8185..c6f64ef3d 100644 --- a/Spigot-Server-Patches/0556-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/Spigot-Server-Patches/0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index d3a6247d6c8e566be11b8b2a3520b001fbdc2d42..bf193badd4d7a78bcd312212b9065213db576bca 100644 +index 1f1ea5c64f325f54a56a3b060706db13c18aca61..6286ef81cb5ef95c4d5e0c384e73fbece0a096f6 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1866,12 +1866,14 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1864,12 +1864,14 @@ public class WorldServer extends World implements GeneratorAccessSeed { } // Paper end diff --git a/Spigot-Server-Patches/0557-Add-moon-phase-API.patch b/Spigot-Server-Patches/0556-Add-moon-phase-API.patch similarity index 100% rename from Spigot-Server-Patches/0557-Add-moon-phase-API.patch rename to Spigot-Server-Patches/0556-Add-moon-phase-API.patch diff --git a/Spigot-Server-Patches/0558-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch similarity index 97% rename from Spigot-Server-Patches/0558-Prevent-headless-pistons-from-being-created.patch rename to Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch index 50e332642..823bc6e57 100644 --- a/Spigot-Server-Patches/0558-Prevent-headless-pistons-from-being-created.patch +++ b/Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created Prevent headless pistons from being created by explosions or tree/mushroom growth. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 669653b5cfb057b277e509b630fd73a843b42b24..a01b28d47669cbc36a9e6c47deb5135bec231948 100644 +index d86474a1a97597c14ea8a28444e2a5d82fcda2a7..e0422471776f34b8e3c753d855aa06f00cc049ec 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -436,6 +436,12 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0559-Brand-support.patch b/Spigot-Server-Patches/0558-Brand-support.patch similarity index 100% rename from Spigot-Server-Patches/0559-Brand-support.patch rename to Spigot-Server-Patches/0558-Brand-support.patch diff --git a/Spigot-Server-Patches/0560-Add-BellRingEvent.patch b/Spigot-Server-Patches/0559-Add-BellRingEvent.patch similarity index 100% rename from Spigot-Server-Patches/0560-Add-BellRingEvent.patch rename to Spigot-Server-Patches/0559-Add-BellRingEvent.patch diff --git a/Spigot-Server-Patches/0561-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0560-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from Spigot-Server-Patches/0561-Add-zombie-targets-turtle-egg-config.patch rename to Spigot-Server-Patches/0560-Add-zombie-targets-turtle-egg-config.patch diff --git a/Spigot-Server-Patches/0562-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0561-Buffer-joins-to-world.patch similarity index 96% rename from Spigot-Server-Patches/0562-Buffer-joins-to-world.patch rename to Spigot-Server-Patches/0561-Buffer-joins-to-world.patch index 88968d0fb..c0d81df51 100644 --- a/Spigot-Server-Patches/0562-Buffer-joins-to-world.patch +++ b/Spigot-Server-Patches/0561-Buffer-joins-to-world.patch @@ -8,7 +8,7 @@ the world per tick, this attempts to reduce the impact that join floods has on the server diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index a01b28d47669cbc36a9e6c47deb5135bec231948..9be3a3e0752a31ca465e3e50bbdad05951a28739 100644 +index e0422471776f34b8e3c753d855aa06f00cc049ec..2e9c3b45052ad641bee091ee28cc57b93cd19ffe 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -452,4 +452,9 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0563-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0562-Optimize-redstone-algorithm.patch similarity index 100% rename from Spigot-Server-Patches/0563-Optimize-redstone-algorithm.patch rename to Spigot-Server-Patches/0562-Optimize-redstone-algorithm.patch diff --git a/Spigot-Server-Patches/0564-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0563-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from Spigot-Server-Patches/0564-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to Spigot-Server-Patches/0563-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/Spigot-Server-Patches/0565-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0564-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from Spigot-Server-Patches/0565-PortalCreateEvent-needs-to-know-its-entity.patch rename to Spigot-Server-Patches/0564-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/Spigot-Server-Patches/0566-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0565-Fix-CraftTeam-null-check.patch similarity index 100% rename from Spigot-Server-Patches/0566-Fix-CraftTeam-null-check.patch rename to Spigot-Server-Patches/0565-Fix-CraftTeam-null-check.patch diff --git a/Spigot-Server-Patches/0567-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0566-Add-more-Evoker-API.patch similarity index 100% rename from Spigot-Server-Patches/0567-Add-more-Evoker-API.patch rename to Spigot-Server-Patches/0566-Add-more-Evoker-API.patch diff --git a/Spigot-Server-Patches/0568-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0567-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 96% rename from Spigot-Server-Patches/0568-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to Spigot-Server-Patches/0567-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch index b8f4e991a..b03f84b43 100644 --- a/Spigot-Server-Patches/0568-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch +++ b/Spigot-Server-Patches/0567-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch @@ -18,7 +18,7 @@ index a45ceff9ff970b996b2767379a2ecd4693f52d3a..4b4f14711d483089a5d5478b57539911 if (this.name == null) { this.name = SystemUtils.a("block", IRegistry.BLOCK.getKey(this)); diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 8540d88f98f5626a79fedd1329782000a2ee7012..ac1ccd066ab80ff6f95c5bc9798f9e05e8db91cf 100644 +index 788540ab2b090e9625d35e20d495733ab8f54331..bf914dc5ee7f2d4a324b6711ea273f5581ec84ad 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -147,6 +147,7 @@ public class EntityTypes { @@ -29,7 +29,7 @@ index 8540d88f98f5626a79fedd1329782000a2ee7012..ac1ccd066ab80ff6f95c5bc9798f9e05 public static Optional> a(String s) { return IRegistry.ENTITY_TYPE.getOptional(MinecraftKey.a(s)); } -@@ -285,6 +286,7 @@ public class EntityTypes { +@@ -286,6 +287,7 @@ public class EntityTypes { return this.bg; } diff --git a/Spigot-Server-Patches/0569-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0568-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from Spigot-Server-Patches/0569-Create-HoverEvent-from-ItemStack-Entity.patch rename to Spigot-Server-Patches/0568-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/Spigot-Server-Patches/0570-Cache-block-data-strings.patch b/Spigot-Server-Patches/0569-Cache-block-data-strings.patch similarity index 100% rename from Spigot-Server-Patches/0570-Cache-block-data-strings.patch rename to Spigot-Server-Patches/0569-Cache-block-data-strings.patch diff --git a/Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0570-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to Spigot-Server-Patches/0570-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/Spigot-Server-Patches/0572-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0571-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from Spigot-Server-Patches/0572-Add-additional-open-container-api-to-HumanEntity.patch rename to Spigot-Server-Patches/0571-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/Spigot-Server-Patches/0573-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0572-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from Spigot-Server-Patches/0573-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to Spigot-Server-Patches/0572-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/Spigot-Server-Patches/0574-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0573-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 93% rename from Spigot-Server-Patches/0574-Extend-block-drop-capture-to-capture-all-items-added.patch rename to Spigot-Server-Patches/0573-Extend-block-drop-capture-to-capture-all-items-added.patch index 66cbe385c..5756d7b3b 100644 --- a/Spigot-Server-Patches/0574-Extend-block-drop-capture-to-capture-all-items-added.patch +++ b/Spigot-Server-Patches/0573-Extend-block-drop-capture-to-capture-all-items-added.patch @@ -25,10 +25,10 @@ index 4b564d36135e9dbdbb57a95791f89aefd180457b..485b609bb5387b0f8a46c1201177cdc6 // Drop event experience if (flag && event != null) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index bf193badd4d7a78bcd312212b9065213db576bca..b1968103165475dd4021570e3a24deb3dc3ac796 100644 +index 6286ef81cb5ef95c4d5e0c384e73fbece0a096f6..5b0b6edfa790918e56399ff6c83f3feb6e5aca49 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1176,6 +1176,13 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1177,6 +1177,13 @@ public class WorldServer extends World implements GeneratorAccessSeed { } else if (this.isUUIDTaken(entity)) { return false; } else { diff --git a/Spigot-Server-Patches/0575-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0574-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from Spigot-Server-Patches/0575-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to Spigot-Server-Patches/0574-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/Spigot-Server-Patches/0576-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-Server-Patches/0575-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from Spigot-Server-Patches/0576-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to Spigot-Server-Patches/0575-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/Spigot-Server-Patches/0577-Lazily-track-plugin-scoreboards-by-default.patch b/Spigot-Server-Patches/0576-Lazily-track-plugin-scoreboards-by-default.patch similarity index 98% rename from Spigot-Server-Patches/0577-Lazily-track-plugin-scoreboards-by-default.patch rename to Spigot-Server-Patches/0576-Lazily-track-plugin-scoreboards-by-default.patch index 3d3225b78..7dcd7bbdc 100644 --- a/Spigot-Server-Patches/0577-Lazily-track-plugin-scoreboards-by-default.patch +++ b/Spigot-Server-Patches/0576-Lazily-track-plugin-scoreboards-by-default.patch @@ -14,7 +14,7 @@ this breaks your workflow you can always force all scoreboards to be tracked wit settings.track-plugin-scoreboards in paper.yml. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 9be3a3e0752a31ca465e3e50bbdad05951a28739..053da5119404ded5e3cf6bb55967cc8ffba47de6 100644 +index 2e9c3b45052ad641bee091ee28cc57b93cd19ffe..6ab0a51b421dc696aec292f2db955311c9cc31e3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -457,4 +457,9 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0578-Entity-isTicking.patch b/Spigot-Server-Patches/0577-Entity-isTicking.patch similarity index 100% rename from Spigot-Server-Patches/0578-Entity-isTicking.patch rename to Spigot-Server-Patches/0577-Entity-isTicking.patch diff --git a/Spigot-Server-Patches/0579-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/Spigot-Server-Patches/0578-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from Spigot-Server-Patches/0579-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to Spigot-Server-Patches/0578-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/Spigot-Server-Patches/0580-Fix-Not-a-string-Map-Conversion-spam.patch b/Spigot-Server-Patches/0579-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from Spigot-Server-Patches/0580-Fix-Not-a-string-Map-Conversion-spam.patch rename to Spigot-Server-Patches/0579-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/Spigot-Server-Patches/0581-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/Spigot-Server-Patches/0580-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch similarity index 100% rename from Spigot-Server-Patches/0581-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch rename to Spigot-Server-Patches/0580-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch diff --git a/Spigot-Server-Patches/0582-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch b/Spigot-Server-Patches/0581-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch similarity index 100% rename from Spigot-Server-Patches/0582-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch rename to Spigot-Server-Patches/0581-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch diff --git a/Spigot-Server-Patches/0583-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/Spigot-Server-Patches/0582-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from Spigot-Server-Patches/0583-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to Spigot-Server-Patches/0582-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/Spigot-Server-Patches/0584-Fix-for-large-move-vectors-crashing-server.patch b/Spigot-Server-Patches/0583-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from Spigot-Server-Patches/0584-Fix-for-large-move-vectors-crashing-server.patch rename to Spigot-Server-Patches/0583-Fix-for-large-move-vectors-crashing-server.patch diff --git a/Spigot-Server-Patches/0585-Optimise-getType-calls.patch b/Spigot-Server-Patches/0584-Optimise-getType-calls.patch similarity index 98% rename from Spigot-Server-Patches/0585-Optimise-getType-calls.patch rename to Spigot-Server-Patches/0584-Optimise-getType-calls.patch index 3d55c63ff..f5dc00293 100644 --- a/Spigot-Server-Patches/0585-Optimise-getType-calls.patch +++ b/Spigot-Server-Patches/0584-Optimise-getType-calls.patch @@ -69,7 +69,7 @@ index 0f89e776816ad4ecb6c3e54c2549692f1b5b6aae..36d7de6e6540e156499edb4b69b8bbae public void setFlag(int flag) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index 7591159c25899fb7a58b25622c6b7241b788652e..820644e0971b42a9698208544232ea87a04ed4a9 100644 +index f44fc4a95954e0745fbcd6d06b79acc37699c77a..4a9245fa5b91b894f982b29f7b87878453189cb9 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -44,7 +44,7 @@ public class CraftBlockData implements BlockData { diff --git a/Spigot-Server-Patches/0586-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from Spigot-Server-Patches/0586-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/Spigot-Server-Patches/0587-Retain-block-place-order-when-capturing-blockstates.patch b/Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from Spigot-Server-Patches/0587-Retain-block-place-order-when-capturing-blockstates.patch rename to Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/Spigot-Server-Patches/0588-Reduce-blockpos-allocation-from-pathfinding.patch b/Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from Spigot-Server-Patches/0588-Reduce-blockpos-allocation-from-pathfinding.patch rename to Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/Spigot-Server-Patches/0589-Fix-item-locations-dropped-from-campfires.patch b/Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from Spigot-Server-Patches/0589-Fix-item-locations-dropped-from-campfires.patch rename to Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch diff --git a/Spigot-Server-Patches/0590-Player-elytra-boost-API.patch b/Spigot-Server-Patches/0589-Player-elytra-boost-API.patch similarity index 93% rename from Spigot-Server-Patches/0590-Player-elytra-boost-API.patch rename to Spigot-Server-Patches/0589-Player-elytra-boost-API.patch index 1206f76d8..7aeafcb76 100644 --- a/Spigot-Server-Patches/0590-Player-elytra-boost-API.patch +++ b/Spigot-Server-Patches/0589-Player-elytra-boost-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index fb1852ea6bf6997771a3522079bf3a32ebca357c..9f04172fb28b89f57515191204c62148d14e0034 100644 +index 7f3275b89a6ab745091a42175be916d8997163df..f4f4e29f56ff8658395c2f5049478eb54aed47bf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2086,6 +2086,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0591-Fixed-TileEntityBell-memory-leak.patch b/Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from Spigot-Server-Patches/0591-Fixed-TileEntityBell-memory-leak.patch rename to Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch diff --git a/Spigot-Server-Patches/0592-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from Spigot-Server-Patches/0592-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/Spigot-Server-Patches/0593-Add-getOfflinePlayerIfCached-String.patch b/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from Spigot-Server-Patches/0593-Add-getOfflinePlayerIfCached-String.patch rename to Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch diff --git a/Spigot-Server-Patches/0594-Add-ignore-discounts-API.patch b/Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch similarity index 100% rename from Spigot-Server-Patches/0594-Add-ignore-discounts-API.patch rename to Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch diff --git a/Spigot-Server-Patches/0595-Toggle-for-removing-existing-dragon.patch b/Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from Spigot-Server-Patches/0595-Toggle-for-removing-existing-dragon.patch rename to Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch diff --git a/Spigot-Server-Patches/0596-Fix-client-lag-on-advancement-loading.patch b/Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from Spigot-Server-Patches/0596-Fix-client-lag-on-advancement-loading.patch rename to Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch diff --git a/Spigot-Server-Patches/0597-Item-no-age-no-player-pickup.patch b/Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch similarity index 100% rename from Spigot-Server-Patches/0597-Item-no-age-no-player-pickup.patch rename to Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch diff --git a/Spigot-Server-Patches/0598-Beacon-API-custom-effect-ranges.patch b/Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from Spigot-Server-Patches/0598-Beacon-API-custom-effect-ranges.patch rename to Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch diff --git a/Spigot-Server-Patches/0599-Add-API-for-quit-reason.patch b/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch similarity index 97% rename from Spigot-Server-Patches/0599-Add-API-for-quit-reason.patch rename to Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch index c2bb0a2e8..fc7444d6f 100644 --- a/Spigot-Server-Patches/0599-Add-API-for-quit-reason.patch +++ b/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch @@ -49,7 +49,7 @@ index 563ae7355f4f4645d21f2fbd494a5b5656c5e664..a736d676ef5e3a25c144743af559bfb4 this.networkManager.close(ichatbasecomponent); }); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 38f26e25cb7d022c0bec5a5928db70611a0d347a..1faefcb5d23e2b86932611ba850fb7b60de896c7 100644 +index dc3df171a6eb11f13272303951fb59a14d7df202..a86a4467a0d0ff44f19d62b436aee469cc7b1e0e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -509,7 +509,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0600-Seed-based-feature-search.patch b/Spigot-Server-Patches/0599-Seed-based-feature-search.patch similarity index 100% rename from Spigot-Server-Patches/0600-Seed-based-feature-search.patch rename to Spigot-Server-Patches/0599-Seed-based-feature-search.patch diff --git a/work/Bukkit b/work/Bukkit index 2e244e41b..f47abd887 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 2e244e41b4c8ca3236d3a6fac512a8b63a2edcdd +Subproject commit f47abd8878a775a446e9608a7ee1584cf827c015 diff --git a/work/CraftBukkit b/work/CraftBukkit index 23618b2cb..4475707d7 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 23618b2cb56759e176e5c7796f945782cd065bc6 +Subproject commit 4475707d74625f37145240027c3ba4c33ba5a183