diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch index 15499955e0..914a718feb 100644 --- a/patches/api/0005-Adventure.patch +++ b/patches/api/0005-Adventure.patch @@ -2100,7 +2100,7 @@ index 9566e4306ada5e82dede0f002aa06da12c44996b..4d5f0837bd0e02a30c943d8969fb6b13 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index f3afe67f0832cb828d25be3654518ff73a80b0e1..598abaa82c634178043a29f6caa6ac5221659d06 100644 +index ead9a9aaad3c7469a9393f3c73aa9a5fdb5b7406..121cd27185269339babae1757a604fbb5aabc869 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; @@ -2112,7 +2112,7 @@ index f3afe67f0832cb828d25be3654518ff73a80b0e1..598abaa82c634178043a29f6caa6ac52 /** * Gets the entity's current position -@@ -710,4 +710,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -724,4 +724,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @Override Spigot spigot(); // Spigot end diff --git a/patches/api/0015-Entity-Origin-API.patch b/patches/api/0015-Entity-Origin-API.patch index 1b28cbdd5b..33fcdeb93b 100644 --- a/patches/api/0015-Entity-Origin-API.patch +++ b/patches/api/0015-Entity-Origin-API.patch @@ -5,10 +5,10 @@ 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 598abaa82c634178043a29f6caa6ac5221659d06..70a32f89c16439c575d8928332cfed64d1d6ab7e 100644 +index 121cd27185269339babae1757a604fbb5aabc869..63137429779d06fafb162f1bfb823d5149b3c58a 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -725,5 +725,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -739,5 +739,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent default net.kyori.adventure.text.event.HoverEvent asHoverEvent(final @NotNull java.util.function.UnaryOperator op) { return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.customName()))); } diff --git a/patches/api/0062-Entity-fromMobSpawner.patch b/patches/api/0062-Entity-fromMobSpawner.patch index d9b896f6ce..7fe0e96d19 100644 --- a/patches/api/0062-Entity-fromMobSpawner.patch +++ b/patches/api/0062-Entity-fromMobSpawner.patch @@ -5,10 +5,10 @@ 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 70a32f89c16439c575d8928332cfed64d1d6ab7e..b1dc148301012ba708333d620c8bdf0062140c8b 100644 +index 63137429779d06fafb162f1bfb823d5149b3c58a..4319dbac54b4cce95ad7479d5bd141a2b12ab7ae 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -735,5 +735,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -749,5 +749,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @Nullable Location getOrigin(); diff --git a/patches/api/0121-Entity-getChunk-API.patch b/patches/api/0121-Entity-getChunk-API.patch index 6b018f8016..1db2f570f9 100644 --- a/patches/api/0121-Entity-getChunk-API.patch +++ b/patches/api/0121-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 b1dc148301012ba708333d620c8bdf0062140c8b..5f703c8847a94c8fd356abe2a0cd45e6af6efcec 100644 +index 4319dbac54b4cce95ad7479d5bd141a2b12ab7ae..5fc085f785719933eef7ab1b3cf173579c64739b 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; @@ -17,7 +17,7 @@ index b1dc148301012ba708333d620c8bdf0062140c8b..5f703c8847a94c8fd356abe2a0cd45e6 import org.bukkit.EntityEffect; import org.bukkit.Location; import org.bukkit.Nameable; -@@ -742,5 +743,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -756,5 +757,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return True if entity spawned from a mob spawner */ boolean fromMobSpawner(); diff --git a/patches/api/0142-Async-Chunks-API.patch b/patches/api/0142-Async-Chunks-API.patch index c73cbeac5c..176c1bfa8f 100644 --- a/patches/api/0142-Async-Chunks-API.patch +++ b/patches/api/0142-Async-Chunks-API.patch @@ -495,7 +495,7 @@ index ca1a4e9bd912258185d59ff70de1e7cc5e43d436..ddc5fd874ccbb5a75ea3e4eddc39a977 /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 5f703c8847a94c8fd356abe2a0cd45e6af6efcec..9eca441d6702752938813a1c97724edf13134171 100644 +index 5fc085f785719933eef7ab1b3cf173579c64739b..711d95bfafac0d415895023bdaac4059395667ab 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -165,6 +165,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0171-Entity-getEntitySpawnReason.patch b/patches/api/0171-Entity-getEntitySpawnReason.patch index 71c620fbed..2b37c961ed 100644 --- a/patches/api/0171-Entity-getEntitySpawnReason.patch +++ b/patches/api/0171-Entity-getEntitySpawnReason.patch @@ -12,10 +12,10 @@ or DEFAULT since data was not stored. Co-authored-by: Aurora diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 9eca441d6702752938813a1c97724edf13134171..9d3c3dedb4f71b9fc35cb5da6e38c77c7c673ad6 100644 +index 711d95bfafac0d415895023bdaac4059395667ab..20a83a2fa9f3d65837fffb027b1f8f1e76957770 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -781,5 +781,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -795,5 +795,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent // TODO remove impl here return getLocation().getChunk(); } diff --git a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch index 01e4d47209..1f094373a4 100644 --- a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch @@ -430,11 +430,11 @@ index 605af1a9fc48602643aec57dd14e8c4ab657a0bc..b3085c7ff8b3e96083d209f6612c0065 /** diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java -index be347c3d0291f44036bae29a4e7e4645d6a4cdf6..76407851a3401982214c3e20aefb406fc5c63310 100644 +index c49628f2638da68e1ec126e53c8b7c74b0d81b22..8dc433baba7060df5cfe6fc10210a5a27287987d 100644 --- a/src/main/java/org/bukkit/entity/LightningStrike.java +++ b/src/main/java/org/bukkit/entity/LightningStrike.java -@@ -15,20 +15,31 @@ public interface LightningStrike extends Entity { - public boolean isEffect(); +@@ -84,20 +84,31 @@ public interface LightningStrike extends Entity { + public void setCausingPlayer(@Nullable Player player); // Spigot start + /** diff --git a/patches/api/0204-Add-entity-liquid-API.patch b/patches/api/0204-Add-entity-liquid-API.patch index 6b08eaecef..11fa994481 100644 --- a/patches/api/0204-Add-entity-liquid-API.patch +++ b/patches/api/0204-Add-entity-liquid-API.patch @@ -5,10 +5,10 @@ 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 9d3c3dedb4f71b9fc35cb5da6e38c77c7c673ad6..e2caf7d0f8c0754617a2d7dfa065fd46e74d3f52 100644 +index 20a83a2fa9f3d65837fffb027b1f8f1e76957770..e9477b04e52fac843c1c15a47325b7bb29f9c6c5 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -787,5 +787,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -801,5 +801,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason(); diff --git a/patches/api/0215-Entity-isTicking.patch b/patches/api/0215-Entity-isTicking.patch index 625612008d..345c297eaa 100644 --- a/patches/api/0215-Entity-isTicking.patch +++ b/patches/api/0215-Entity-isTicking.patch @@ -5,10 +5,10 @@ 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 e2caf7d0f8c0754617a2d7dfa065fd46e74d3f52..cb850d4310af0ba7db5ebee8fabe61e94cea6dad 100644 +index e9477b04e52fac843c1c15a47325b7bb29f9c6c5..1dda73ca06a8d513cc3e9a3e4b1739520ca900ec 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -822,5 +822,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -836,5 +836,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * Check if entity is in lava */ boolean isInLava(); diff --git a/patches/api/0226-More-lightning-API.patch b/patches/api/0226-More-lightning-API.patch index 9f0e055024..4197f480bf 100644 --- a/patches/api/0226-More-lightning-API.patch +++ b/patches/api/0226-More-lightning-API.patch @@ -5,10 +5,30 @@ Subject: [PATCH] More lightning API diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java -index 76407851a3401982214c3e20aefb406fc5c63310..ba06afd01d1e1fef2123412735653593453d3ab7 100644 +index 8dc433baba7060df5cfe6fc10210a5a27287987d..0b9e02bb88a1b1fe7378c11f1cca9c93b183f814 100644 --- a/src/main/java/org/bukkit/entity/LightningStrike.java +++ b/src/main/java/org/bukkit/entity/LightningStrike.java -@@ -42,4 +42,72 @@ public interface LightningStrike extends Entity { +@@ -22,7 +22,9 @@ public interface LightningStrike extends Entity { + * removed. By default this value is between 1 and 3. + * + * @return the flashes ++ * @deprecated use {@link #getFlashCount()} + */ ++ @Deprecated // Paper + public int getFlashes(); + + /** +@@ -31,7 +33,9 @@ public interface LightningStrike extends Entity { + * has reduced below 0. + * + * @param flashes the flashes ++ * @deprecated use {@link #setFlashCount(int)} + */ ++ @Deprecated // Paper + public void setFlashes(int flashes); + + /** +@@ -111,4 +115,42 @@ public interface LightningStrike extends Entity { @Deprecated // Paper Spigot spigot(); // Spigot end @@ -31,22 +51,6 @@ index 76407851a3401982214c3e20aefb406fc5c63310..ba06afd01d1e1fef2123412735653593 + void setFlashCount(int flashes); + + /** -+ * Returns the amount of ticks the current flash will do damage for. -+ * Starts with 2 by default, will damage while it is equal to or above 0, with the next flash beginning somewhere between 0 and -9. -+ * -+ * @return ticks the current flash will do damage for -+ */ -+ int getLifeTicks(); -+ -+ /** -+ * Sets the amount of ticks the current flash will do damage/fire for. -+ * Default is 2 for each flash, on which the sound and effect will also be played. -+ * -+ * @param lifeTicks ticks the current flash will do damage for -+ */ -+ void setLifeTicks(int lifeTicks); -+ -+ /** + * Returns the potential entity that caused this lightning strike to spawn in the world. + *

+ * As of implementing this method, only {@link Player}s are capable of causing a lightning strike, however as this @@ -65,19 +69,5 @@ index 76407851a3401982214c3e20aefb406fc5c63310..ba06afd01d1e1fef2123412735653593 + */ + @org.jetbrains.annotations.Nullable + Entity getCausingEntity(); -+ -+ /** -+ * Updates the player that caused this lightning to be summoned into the world. -+ * By default, players that channel their {@link Trident} will be the cause of the respective lightning. -+ *

-+ * While the respective getter method {@link #getCausingEntity()} does not guarantee a player as the cause of a -+ * lightning to stay as future proof as possible, as of implementing this method, players are the only entities -+ * that can cause a lightning strike and hence this setter is restricted to players. -+ *

-+ * -+ * @param causingPlayer the player that should be the new cause of this lightning. {@code null} may be passed to -+ * indicate that no player is responsible for this lightning. -+ */ -+ void setCausingPlayer(@org.jetbrains.annotations.Nullable Player causingPlayer); + // Paper end } diff --git a/patches/api/0258-Expose-Tracked-Players.patch b/patches/api/0258-Expose-Tracked-Players.patch index c32bb8acf2..ef64931c5d 100644 --- a/patches/api/0258-Expose-Tracked-Players.patch +++ b/patches/api/0258-Expose-Tracked-Players.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose Tracked Players diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index cb850d4310af0ba7db5ebee8fabe61e94cea6dad..a6f9fb065a9e3e56b86ce5f606f86e681a90d7e6 100644 +index 1dda73ca06a8d513cc3e9a3e4b1739520ca900ec..e0e3af0f229f8af66de70d7b741200e301476677 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -827,5 +827,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -841,5 +841,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * Check if entity is inside a ticking chunk */ boolean isTicking(); @@ -17,7 +17,9 @@ index cb850d4310af0ba7db5ebee8fabe61e94cea6dad..a6f9fb065a9e3e56b86ce5f606f86e68 + * Returns a set of {@link Player Players} within this entity's tracking range (players that can "see" this entity). + * + * @return players in tracking range ++ * @deprecated slightly misleading name, use {@link #getTrackedBy()} + */ ++ @Deprecated + @NotNull Set getTrackedPlayers(); // Paper end } diff --git a/patches/api/0324-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0324-Add-Raw-Byte-Entity-Serialization.patch index 91aea20aaa..5947d4491a 100644 --- a/patches/api/0324-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/api/0324-Add-Raw-Byte-Entity-Serialization.patch @@ -24,12 +24,12 @@ index c9fdcda4d86a8419852d7acc0e85fe51656a829b..943736891bf58e620c47391b37c1d006 * Creates and returns the next EntityId available. *

diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index a6f9fb065a9e3e56b86ce5f606f86e681a90d7e6..962989e74a66dadab2a8951ccc85ef0c49f8da6b 100644 +index e0e3af0f229f8af66de70d7b741200e301476677..765777b10f5984b0fbdf22ef884e79745d06b4ff 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -834,5 +834,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent - * @return players in tracking range +@@ -850,5 +850,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ + @Deprecated @NotNull Set getTrackedPlayers(); + + /** diff --git a/patches/api/0330-Entity-powdered-snow-API.patch b/patches/api/0330-Entity-powdered-snow-API.patch index 3ed79d314d..0a4e36dee8 100644 --- a/patches/api/0330-Entity-powdered-snow-API.patch +++ b/patches/api/0330-Entity-powdered-snow-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity powdered snow API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 962989e74a66dadab2a8951ccc85ef0c49f8da6b..e0dccc48c230fdee9196245e9cefd4b02b4d3782 100644 +index 765777b10f5984b0fbdf22ef884e79745d06b4ff..edfce041e0cdfe9d33c385dfa1875017d43def80 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -861,5 +861,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -877,5 +877,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return Whether the entity was successfully spawned. */ public boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason); diff --git a/patches/api/0342-Freeze-Tick-Lock-API.patch b/patches/api/0342-Freeze-Tick-Lock-API.patch index fdf81b1a62..f046aa1023 100644 --- a/patches/api/0342-Freeze-Tick-Lock-API.patch +++ b/patches/api/0342-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index e0dccc48c230fdee9196245e9cefd4b02b4d3782..ab0ceaba9ddcbe20a8b8a1fc3ed19cb3c64ecd3d 100644 +index edfce041e0cdfe9d33c385dfa1875017d43def80..77e29cada05da8946d718fe331e28e7553922033 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -280,6 +280,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0369-More-Teleport-API.patch b/patches/api/0369-More-Teleport-API.patch index e736573b03..d76458bbf1 100644 --- a/patches/api/0369-More-Teleport-API.patch +++ b/patches/api/0369-More-Teleport-API.patch @@ -125,7 +125,7 @@ index 0000000000000000000000000000000000000000..dbacefc919fd6ed6a0f5cdaa0f695a12 + +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index ab0ceaba9ddcbe20a8b8a1fc3ed19cb3c64ecd3d..97f0bc6573c8ba09de77061b6312b91cd713221d 100644 +index 77e29cada05da8946d718fe331e28e7553922033..5607404fa0132febdbdaad051a4e9426fe5f1eb6 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -123,10 +123,34 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0372-Collision-API.patch b/patches/api/0372-Collision-API.patch index 058669aa74..52beb80b45 100644 --- a/patches/api/0372-Collision-API.patch +++ b/patches/api/0372-Collision-API.patch @@ -25,10 +25,10 @@ index 93e20ca14a2b7e5817fab788b6dfa73c6ced6acb..cbb51dde78f792db4ddac43f144d23ff // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 97f0bc6573c8ba09de77061b6312b91cd713221d..3f3ea5bb6b3ea6f55b5cd699f1c01ac159619add 100644 +index 5607404fa0132febdbdaad051a4e9426fe5f1eb6..7f341ba602f0ecbc2953bb19589146b5ae5d0ea9 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -913,4 +913,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -929,4 +929,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean isInPowderedSnow(); // Paper end diff --git a/patches/api/0399-Add-Sneaking-API-for-Entities.patch b/patches/api/0399-Add-Sneaking-API-for-Entities.patch index 6bda4587c7..1cd5be621d 100644 --- a/patches/api/0399-Add-Sneaking-API-for-Entities.patch +++ b/patches/api/0399-Add-Sneaking-API-for-Entities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Sneaking API for Entities diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 3f3ea5bb6b3ea6f55b5cd699f1c01ac159619add..a2a423d4e4c2702ba5967223cab0432dd7d04732 100644 +index 7f341ba602f0ecbc2953bb19589146b5ae5d0ea9..9c7eba228dc1c244d49cb5139e1710804b887d6a 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -765,6 +765,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -779,6 +779,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @NotNull Pose getPose(); diff --git a/patches/api/0406-Add-Entity-Body-Yaw-API.patch b/patches/api/0406-Add-Entity-Body-Yaw-API.patch index 648ed2457f..d797fb4127 100644 --- a/patches/api/0406-Add-Entity-Body-Yaw-API.patch +++ b/patches/api/0406-Add-Entity-Body-Yaw-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index a2a423d4e4c2702ba5967223cab0432dd7d04732..7b944a4fde359e169da9188fa63cf937f5329091 100644 +index 9c7eba228dc1c244d49cb5139e1710804b887d6a..db4231b6e77a7cf9fe430e5207c1fc9c1702c3f7 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -931,6 +931,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -947,6 +947,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return true if in powdered snow. */ boolean isInPowderedSnow(); diff --git a/patches/api/0417-Folia-scheduler-and-owned-region-API.patch b/patches/api/0417-Folia-scheduler-and-owned-region-API.patch index 396c2474be..b9c7657910 100644 --- a/patches/api/0417-Folia-scheduler-and-owned-region-API.patch +++ b/patches/api/0417-Folia-scheduler-and-owned-region-API.patch @@ -769,10 +769,10 @@ index 7bdac4b297e40383dd2ef4e2735fdfb086ecaa14..6b72eccdcb6f75534a4267a1dd0a4cc2 + // Paper end - Folia region threading API } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 7b944a4fde359e169da9188fa63cf937f5329091..da943955496c1bbd767cbf17150b3ad79313e57d 100644 +index db4231b6e77a7cf9fe430e5207c1fc9c1702c3f7..accf3f265ddd49ab866508d1a71289e185827d5e 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -991,4 +991,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1007,4 +1007,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean wouldCollideUsing(@NotNull BoundingBox boundingBox); // Paper End - Collision API diff --git a/patches/api/0426-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0426-API-for-an-entity-s-scoreboard-name.patch index 5ee457545a..7dd96c655d 100644 --- a/patches/api/0426-API-for-an-entity-s-scoreboard-name.patch +++ b/patches/api/0426-API-for-an-entity-s-scoreboard-name.patch @@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different methods depending on the implementation of Entity you were working with. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index da943955496c1bbd767cbf17150b3ad79313e57d..4669037e4dc9d7bb283e0e2fb4c955bec31b916d 100644 +index accf3f265ddd49ab866508d1a71289e185827d5e..2177eb74ab50b30b100aa8f35fc1d99b860ea7fd 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1002,4 +1002,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1018,4 +1018,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull io.papermc.paper.threadedregions.scheduler.EntityScheduler getScheduler(); // Paper end - Folia schedulers diff --git a/patches/api/0431-Expand-Pose-API.patch b/patches/api/0431-Expand-Pose-API.patch index 3d2038c05b..1e19715df2 100644 --- a/patches/api/0431-Expand-Pose-API.patch +++ b/patches/api/0431-Expand-Pose-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expand Pose API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 4669037e4dc9d7bb283e0e2fb4c955bec31b916d..762cb07861ca8ff058ce8d57ea6c15df1e588bf3 100644 +index 2177eb74ab50b30b100aa8f35fc1d99b860ea7fd..d340ddcf6924cc834455de3acbbac91ab9c66e39 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -782,6 +782,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -796,6 +796,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @param sneak true if the entity should be sneaking */ void setSneaking(boolean sneak); diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 2f45986ef3..8109fb92d4 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -28,7 +28,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..813e9019e5bd487edfbb7a52592f979419fee0b5 +index 0000000000000000000000000000000000000000..beb19d5aa6cb60115cbd173b2a7f67769b4a367d --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,139 @@ @@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..813e9019e5bd487edfbb7a52592f9794 + } + implementation("org.ow2.asm:asm:9.5") + implementation("commons-lang:commons-lang:2.6") -+ runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0") ++ runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1") + runtimeOnly("com.mysql:mysql-connector-j:8.1.0") + + runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5") @@ -173,7 +173,7 @@ index 0000000000000000000000000000000000000000..813e9019e5bd487edfbb7a52592f9794 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index 0a4c743922d62b6b8c1f00729579bc13c224e134..0000000000000000000000000000000000000000 +index 20658694ee91e70d12ee874d8895ee9446e8ae9c..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,596 +0,0 @@ @@ -413,7 +413,7 @@ index 0a4c743922d62b6b8c1f00729579bc13c224e134..00000000000000000000000000000000 - - org.xerial - sqlite-jdbc -- 3.43.0.0 +- 3.42.0.1 - runtime - - diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch index 7f4a63a3f9..34dc7ba44e 100644 --- a/patches/server/0002-Remap-fixes.patch +++ b/patches/server/0002-Remap-fixes.patch @@ -74,10 +74,10 @@ index 7918deb55e6ed2e16eba501ab380a456270d9512..a81475d0cd3c5b75b4abe0d1a0138937 }); ResourceLocation minecraftkey = recipeholder.id(); diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java -index fce67663f0a954d9f184c04bf96e23e6fb2ac5eb..c21dd258d749c28e509c86a70c1f85712aeeda9e 100644 +index 95a5ce711150c4c999a9d17f28a497f034638610..214215d203892b8009595539f25ce26e8752debd 100644 --- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java +++ b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java -@@ -250,8 +250,8 @@ public class LootTable { +@@ -251,8 +251,8 @@ public class LootTable { public static class Builder implements FunctionUserBuilder { diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch index 4ec13e781a..ef01672983 100644 --- a/patches/server/0003-Build-system-changes.patch +++ b/patches/server/0003-Build-system-changes.patch @@ -9,7 +9,7 @@ public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/ Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 813e9019e5bd487edfbb7a52592f979419fee0b5..0ced1beb116b1dc43a79415aa154d32cb22d23d0 100644 +index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afea2319815 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,10 +9,9 @@ plugins { @@ -23,7 +23,7 @@ index 813e9019e5bd487edfbb7a52592f979419fee0b5..0ced1beb116b1dc43a79415aa154d32c implementation("org.ow2.asm:asm:9.5") + implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1") runtimeOnly("com.mysql:mysql-connector-j:8.1.0") @@ -23,6 +22,8 @@ dependencies { diff --git a/patches/server/0004-Test-changes.patch b/patches/server/0004-Test-changes.patch index e9fa837f46..b761eee237 100644 --- a/patches/server/0004-Test-changes.patch +++ b/patches/server/0004-Test-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Test changes diff --git a/build.gradle.kts b/build.gradle.kts -index 0ced1beb116b1dc43a79415aa154d32cb22d23d0..067440c8cb05bee3539303716a93a4369849a5af 100644 +index 3a8b06b7cafb912cf1faecd219673afea2319815..e03e01c4b9f3886a72c569d7a64da0cca5cbcc5b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { @@ -14,7 +14,7 @@ index 0ced1beb116b1dc43a79415aa154d32cb22d23d0..067440c8cb05bee3539303716a93a436 implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation + testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1") runtimeOnly("com.mysql:mysql-connector-j:8.1.0") @@ -59,6 +60,12 @@ tasks.compileJava { options.setIncremental(false) diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch index 0263a4dc9f..fb08bf29e2 100644 --- a/patches/server/0005-Paper-config-files.patch +++ b/patches/server/0005-Paper-config-files.patch @@ -15,7 +15,7 @@ public net.minecraft.server.dedicated.DedicatedServerProperties reload(Lnet/mine public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES diff --git a/build.gradle.kts b/build.gradle.kts -index 067440c8cb05bee3539303716a93a4369849a5af..82562c36460ae14aff6a2fafceeee36eddd8558a 100644 +index e03e01c4b9f3886a72c569d7a64da0cca5cbcc5b..7c0b13c12f8f8ab43cc4128dc90101f527482a0d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,7 @@ dependencies { @@ -24,7 +24,7 @@ index 067440c8cb05bee3539303716a93a4369849a5af..82562c36460ae14aff6a2fafceeee36e testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito + implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1") runtimeOnly("com.mysql:mysql-connector-j:8.1.0") diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch index f9797f263b..d889d94c33 100644 --- a/patches/server/0006-MC-Dev-fixes.patch +++ b/patches/server/0006-MC-Dev-fixes.patch @@ -257,16 +257,3 @@ index 69a19dbf58cde41680d086e78b9a12ffee602dbf..5dcb7f9cab097990148f5a7c4ccbe155 return AbortableIterationConsumer.Continuation.ABORT; } } -diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructurePiece.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructurePiece.java -index 9b1d6cad982d85874fd7cedee730e5155dba8f80..f182528d693d1fea41ebc12ac55d9ed4033cbc7b 100644 ---- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructurePiece.java -+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructurePiece.java -@@ -489,7 +489,7 @@ public abstract class StructurePiece { - } - - public static BoundingBox createBoundingBox(Stream pieces) { -- Stream stream1 = pieces.map(StructurePiece::getBoundingBox); -+ Stream stream1 = pieces.map(StructurePiece::getBoundingBox); // Paper - decompile fix - - Objects.requireNonNull(stream1); - return (BoundingBox) BoundingBox.encapsulatingBoxes(stream1::iterator).orElseThrow(() -> { diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch index 9086079a04..eb8ca352d0 100644 --- a/patches/server/0009-MC-Utils.patch +++ b/patches/server/0009-MC-Utils.patch @@ -7913,10 +7913,10 @@ index 29bd4879ef94bcfea879fac49dea22eba4af8251..f07c3bfa42c3e26b19c08b3b5ad2ad8d + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index b3d1452831db0d7e9765e8e3d437db449bd0010f..4c4d92f934b6463ea7dd88bf5bd664f364742360 100644 +index bdf7d8e4256626b6866f8c6fed1fde64b7cc6892..2a55bbd728aea55a6ca0f6a7d856d1e3a3f1e1a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1185,4 +1185,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1202,4 +1202,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return this.spigot; } // Spigot end diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch index 33a5178e76..16e435e69c 100644 --- a/patches/server/0010-Adventure.patch +++ b/patches/server/0010-Adventure.patch @@ -3527,7 +3527,7 @@ index f6c614bb1184f9c79121f64a2a030bf3f094b671..e8334e2264510f5101e80b4f130e7ae1 public net.minecraft.world.item.enchantment.Enchantment getHandle() { return this.target; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 4c4d92f934b6463ea7dd88bf5bd664f364742360..c888dce92fa4c26bbbeba7eab299841b01732e6b 100644 +index 2a55bbd728aea55a6ca0f6a7d856d1e3a3f1e1a3..1557a28769cfe875b4c81ed503b2c1815caf8d90 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -206,6 +206,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -3571,7 +3571,7 @@ index 4c4d92f934b6463ea7dd88bf5bd664f364742360..c888dce92fa4c26bbbeba7eab299841b @Override public void setCustomName(String name) { // sane limit for name length -@@ -942,6 +969,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -959,6 +986,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public String getName() { return CraftChatMessage.fromComponent(this.getHandle().getName()); } @@ -4137,7 +4137,7 @@ index 5725b0281ac53a2354b233223259d6784353bc6e..9ef939b76d06874b856e0c850addb364 @Override public int getLineWidth() { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 23e7924320a9061cfb9769ed09c5e679ef4cff47..52a5f1a6585abe42018e8758c5ac462bfb0fe1d1 100644 +index 789469a9bae1c486180b19a32739334b4e0a37bc..73c6bbb854db86a58285466699358eeec4e603a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -879,9 +879,9 @@ public class CraftEventFactory { diff --git a/patches/server/0033-Entity-Origin-API.patch b/patches/server/0033-Entity-Origin-API.patch index 39662b5838..918a322e20 100644 --- a/patches/server/0033-Entity-Origin-API.patch +++ b/patches/server/0033-Entity-Origin-API.patch @@ -132,10 +132,10 @@ index 415b8822f0dfb14d49bccb2a10ac04025891ddf7..89fd5d6b373d2705dccc2f22663048f4 @Nullable diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index c888dce92fa4c26bbbeba7eab299841b01732e6b..38ef3c68cb8581c4f069362d1fc1d5d2b5171ba9 100644 +index 1557a28769cfe875b4c81ed503b2c1815caf8d90..210024c91eccd074a238e7a7834bbfb8c1b61b34 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1255,5 +1255,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1272,5 +1272,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return ret; } diff --git a/patches/server/0058-Add-velocity-warnings.patch b/patches/server/0058-Add-velocity-warnings.patch index 572316a101..e29daf933d 100644 --- a/patches/server/0058-Add-velocity-warnings.patch +++ b/patches/server/0058-Add-velocity-warnings.patch @@ -17,7 +17,7 @@ index afb8f7c86558f9f72858d0e490c174d24bfcc670..25ffb95d7d4a5b34577b1e3435169966 static { ConfigurationSerialization.registerClass(CraftOfflinePlayer.class); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 38ef3c68cb8581c4f069362d1fc1d5d2b5171ba9..526fd29c425df1eee3b0d3502d2272605c216c19 100644 +index 210024c91eccd074a238e7a7834bbfb8c1b61b34..b4780e2a244b4cd8ab827bd844a01c3360f46b03 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -470,10 +470,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0110-Add-EntityZapEvent.patch b/patches/server/0110-Add-EntityZapEvent.patch index 6b786427d4..fed574b02e 100644 --- a/patches/server/0110-Add-EntityZapEvent.patch +++ b/patches/server/0110-Add-EntityZapEvent.patch @@ -28,7 +28,7 @@ index 2f97e4f0078cecbcf044d0b27f375638a6ea047b..b70ee1dff0442de32a9e20ad54b246d5 entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) 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 52a5f1a6585abe42018e8758c5ac462bfb0fe1d1..4d19bb09c3f6090de552982a8722c742892913eb 100644 +index 73c6bbb854db86a58285466699358eeec4e603a0..cc001f8f1bf4df4fedcc637f5b142d8c059482cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1240,6 +1240,14 @@ public class CraftEventFactory { diff --git a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch index 8e82cad32b..fc0f0471f6 100644 --- a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch +++ b/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch @@ -18,7 +18,7 @@ index 93c83cfedc7d3a169ad0504aa6e63f600873501b..9dffdfe5bbd0517e9a2c6a6770eea07b --this.count; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 4d19bb09c3f6090de552982a8722c742892913eb..6e6060563fad15c5c2c0d0248bce067aa3104572 100644 +index cc001f8f1bf4df4fedcc637f5b142d8c059482cc..82a0f2ab2d49cca715b04a5cc661dc81bef3090e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1193,6 +1193,17 @@ public class CraftEventFactory { diff --git a/patches/server/0115-Add-ProjectileCollideEvent.patch b/patches/server/0115-Add-ProjectileCollideEvent.patch index 5b301d354f..7f58b754a7 100644 --- a/patches/server/0115-Add-ProjectileCollideEvent.patch +++ b/patches/server/0115-Add-ProjectileCollideEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add ProjectileCollideEvent Deprecated now and replaced with ProjectileHitEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 6e6060563fad15c5c2c0d0248bce067aa3104572..9546f716da41aef994d8e3799bdf5c6b74e96ad6 100644 +index 82a0f2ab2d49cca715b04a5cc661dc81bef3090e..5a61bc2979854d891f8f4e384b3c248d882555b3 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1337,6 +1337,17 @@ public class CraftEventFactory { diff --git a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch index 04f97b7db0..51e9914599 100644 --- a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -25,7 +25,7 @@ Other changes: Co-Authored-By: Emilia Kond diff --git a/build.gradle.kts b/build.gradle.kts -index 82562c36460ae14aff6a2fafceeee36eddd8558a..e7ed61452ae5c33078e196cabc648ff39d0e5c23 100644 +index 7c0b13c12f8f8ab43cc4128dc90101f527482a0d..619d1ff6a5305bf1567d244b1459a8ac5ffdbe3d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,9 +6,30 @@ plugins { diff --git a/patches/server/0145-Entity-fromMobSpawner.patch b/patches/server/0145-Entity-fromMobSpawner.patch index 7b500645d9..5650152e76 100644 --- a/patches/server/0145-Entity-fromMobSpawner.patch +++ b/patches/server/0145-Entity-fromMobSpawner.patch @@ -49,10 +49,10 @@ index 7ae0465091db8e8061737bf93884afa3db49feeb..5d6403fa27521860a69a707dc4358b01 if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) { continue; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 526fd29c425df1eee3b0d3502d2272605c216c19..d6583c6b77356d15025b961ebed3e20418d71318 100644 +index b4780e2a244b4cd8ab827bd844a01c3360f46b03..714a8fb1715751038c411ea7f2f0cf37ee41abd8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1300,5 +1300,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1317,5 +1317,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { //noinspection ConstantConditions return originVector.toLocation(world); } diff --git a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch index d739f5f771..a30cbbcc8b 100644 --- a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/build.gradle.kts b/build.gradle.kts -index e7ed61452ae5c33078e196cabc648ff39d0e5c23..d2dbc66c9981f5b9d4fe445c19e387d10c7368dc 100644 +index 619d1ff6a5305bf1567d244b1459a8ac5ffdbe3d..4f6b8060cb180b48ab9e3ec349b4f46a5a1b6363 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { diff --git a/patches/server/0204-Fix-CraftEntity-hashCode.patch b/patches/server/0204-Fix-CraftEntity-hashCode.patch index bc20ef512e..e44e036f31 100644 --- a/patches/server/0204-Fix-CraftEntity-hashCode.patch +++ b/patches/server/0204-Fix-CraftEntity-hashCode.patch @@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle() However, replaced it too to make it clearer of intent. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index d6583c6b77356d15025b961ebed3e20418d71318..e3ed6a4315f8e0411144a5e585f9f49114cdf1b6 100644 +index 714a8fb1715751038c411ea7f2f0cf37ee41abd8..5e9642662716a0e60a700e6359539339f1cf5230 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -840,14 +840,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0216-InventoryCloseEvent-Reason-API.patch b/patches/server/0216-InventoryCloseEvent-Reason-API.patch index a7c1ab6a9b..e9771cfe80 100644 --- a/patches/server/0216-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0216-InventoryCloseEvent-Reason-API.patch @@ -186,7 +186,7 @@ index 28a51536bcfcb124fecc61095227cabd8844d4e6..1f2c0e3788700a5900664fa61e811a28 // Check if the fromWorld and toWorld are the same. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 9546f716da41aef994d8e3799bdf5c6b74e96ad6..1ee49bb62df6f9c7e88a8484ce97103ada5d6d6d 100644 +index 5a61bc2979854d891f8f4e384b3c248d882555b3..405c541e790c47c8ccdf05c902cc5f8969a759f9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1306,7 +1306,7 @@ public class CraftEventFactory { diff --git a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index 246784575d..e29f37abfd 100644 --- a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread diff --git a/build.gradle.kts b/build.gradle.kts -index d2dbc66c9981f5b9d4fe445c19e387d10c7368dc..21a94671e77cd72dabcf76c26b12d3ccbe23a9dd 100644 +index 4f6b8060cb180b48ab9e3ec349b4f46a5a1b6363..d0f15081ed6ce6c633c46423fd666d74f50fdf8b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,6 +38,7 @@ dependencies { implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1") runtimeOnly("com.mysql:mysql-connector-j:8.1.0") + runtimeOnly("com.lmax:disruptor:3.4.4") // Paper diff --git a/patches/server/0226-Vanished-players-don-t-have-rights.patch b/patches/server/0226-Vanished-players-don-t-have-rights.patch index 96d8cd6bff..6be9324cda 100644 --- a/patches/server/0226-Vanished-players-don-t-have-rights.patch +++ b/patches/server/0226-Vanished-players-don-t-have-rights.patch @@ -89,7 +89,7 @@ index 0b02ba70956ea1352ea8e67957b3789408b67f6b..8320bece16dfa339e33801e43ff2f297 public boolean isClientSide() { 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 1ee49bb62df6f9c7e88a8484ce97103ada5d6d6d..5e20a49940e7fdbc470193b44a604829e38fbae6 100644 +index 405c541e790c47c8ccdf05c902cc5f8969a759f9..ffa0129a4ad3ed12b2afabaea43544f49b330207 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1343,6 +1343,14 @@ public class CraftEventFactory { diff --git a/patches/server/0253-Improve-death-events.patch b/patches/server/0253-Improve-death-events.patch index 4dc884c63c..4623ab0c15 100644 --- a/patches/server/0253-Improve-death-events.patch +++ b/patches/server/0253-Improve-death-events.patch @@ -412,7 +412,7 @@ index 9c988b83338c5cf2cbe12aabc729b9184bb3e97d..92e64162181b73e5201e1e3e52db9e37 public void injectScaledMaxHealth(Collection collection, boolean force) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 5e20a49940e7fdbc470193b44a604829e38fbae6..a1f6b35eec45e99013db02a727159d186150474a 100644 +index ffa0129a4ad3ed12b2afabaea43544f49b330207..87be89a5e2d8b885f6f077433d4a7e402e8c7d49 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -865,9 +865,16 @@ public class CraftEventFactory { diff --git a/patches/server/0295-Implement-Brigadier-Mojang-API.patch b/patches/server/0295-Implement-Brigadier-Mojang-API.patch index 0743b58dcf..f1d85062b9 100644 --- a/patches/server/0295-Implement-Brigadier-Mojang-API.patch +++ b/patches/server/0295-Implement-Brigadier-Mojang-API.patch @@ -10,7 +10,7 @@ Adds CommandRegisteredEvent - Allows manipulating the CommandNode to add more children/metadata for the client diff --git a/build.gradle.kts b/build.gradle.kts -index 21a94671e77cd72dabcf76c26b12d3ccbe23a9dd..5cf067ce5010ff5fbbe010555b62dc57268e2a47 100644 +index d0f15081ed6ce6c633c46423fd666d74f50fdf8b..ae99ecbf9055314764d32819dcdcb304caefb5ca 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,6 +14,7 @@ val alsoShade: Configuration by configurations.creating diff --git a/patches/server/0300-Entity-getEntitySpawnReason.patch b/patches/server/0300-Entity-getEntitySpawnReason.patch index dc83a79c5b..f702e11321 100644 --- a/patches/server/0300-Entity-getEntitySpawnReason.patch +++ b/patches/server/0300-Entity-getEntitySpawnReason.patch @@ -120,10 +120,10 @@ index a9be524edb03c51300bc45d424fcf87c7491a8c0..a08c2dee792da1a54005f0a65a9eefab // CraftBukkit start if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index e3ed6a4315f8e0411144a5e585f9f49114cdf1b6..fa2cf604910977c0275f7731286618fe3c355a36 100644 +index 5e9642662716a0e60a700e6359539339f1cf5230..96f78f74433b4b54cf4ebec624649eca4f157602 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1306,5 +1306,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1323,5 +1323,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public boolean fromMobSpawner() { return getHandle().spawnedViaMobSpawner; } diff --git a/patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch index 0fe70d9166..0e77519ffd 100644 --- a/patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch +++ b/patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent bees loading chunks checking hive position diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 407788ef7b0076e3bc5ec565af0470f1ab4865fa..4111ac5efa63c8063734646d0a8a8154f52f653d 100644 +index 010d7b910a55875f4059bbf014535653b027b0a5..98b0b91a8033ae297fee3fe655ee641e9ab08154 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -502,6 +502,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { diff --git a/patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch index 21d913fee7..e561797b3b 100644 --- a/patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch +++ b/patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bees get gravity in void. Fixes MC-167279 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 4111ac5efa63c8063734646d0a8a8154f52f653d..644a0e9858b61d0032ea2919fab40c444bc84f85 100644 +index 98b0b91a8033ae297fee3fe655ee641e9ab08154..27e3bed06cfb5c36125b55c4862fca94ade26a09 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -147,7 +147,22 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { diff --git a/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch index 09a7646a95..c407c28b51 100644 --- a/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch +++ b/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a1f6b35eec45e99013db02a727159d186150474a..accf3399f813ad062a3dba6eba99c16afe66045a 100644 +index 87be89a5e2d8b885f6f077433d4a7e402e8c7d49..cb8ac0475c842ba8c70564ed8a9c5d148257262a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -401,13 +401,18 @@ public class CraftEventFactory { diff --git a/patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch index ad483cccb6..aa41e146a6 100644 --- a/patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch +++ b/patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not allow bees to load chunks for beehives diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 644a0e9858b61d0032ea2919fab40c444bc84f85..9c7c59d1230110010033a9c9959b375eac3ebc2b 100644 +index 27e3bed06cfb5c36125b55c4862fca94ade26a09..41f5b4fc4a4b7d2a54b08869d4afa450f34caf91 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -413,6 +413,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { diff --git a/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch index e94b26fd01..380902a62d 100644 --- a/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -135,7 +135,7 @@ index 86c08e36779af6f85932c1c346c54594f543db0d..7e996a527a632a2b382f5eea6df6be83 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index accf3399f813ad062a3dba6eba99c16afe66045a..1a2f03895f348e4c2620caef74f12cb1f41dec1b 100644 +index cb8ac0475c842ba8c70564ed8a9c5d148257262a..4e0b6798754710e9fa598016938f033ae17b8a09 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -868,6 +868,11 @@ public class CraftEventFactory { diff --git a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index b4d1ed3a20..e33c31ee32 100644 --- a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and diff --git a/build.gradle.kts b/build.gradle.kts -index 5cf067ce5010ff5fbbe010555b62dc57268e2a47..200b9cce4636892a233221665284815c30facbfe 100644 +index ae99ecbf9055314764d32819dcdcb304caefb5ca..09e387db084b2bcff2b55d3eca23124e8d384283 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,6 +37,7 @@ dependencies { @@ -14,7 +14,7 @@ index 5cf067ce5010ff5fbbe010555b62dc57268e2a47..200b9cce4636892a233221665284815c implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files implementation("commons-lang:commons-lang:2.6") + implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation - runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1") runtimeOnly("com.mysql:mysql-connector-j:8.1.0") runtimeOnly("com.lmax:disruptor:3.4.4") // Paper @@ -127,6 +128,18 @@ tasks.check { diff --git a/patches/server/0392-Implement-Mob-Goal-API.patch b/patches/server/0392-Implement-Mob-Goal-API.patch index 304b4ead69..1f35b1bd05 100644 --- a/patches/server/0392-Implement-Mob-Goal-API.patch +++ b/patches/server/0392-Implement-Mob-Goal-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/build.gradle.kts b/build.gradle.kts -index 200b9cce4636892a233221665284815c30facbfe..a4c39e1302dff6ec43e84e3d04f234733b81a85b 100644 +index 09e387db084b2bcff2b55d3eca23124e8d384283..56b1eb0136777931b99524edc6077d138f41e023 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,6 +46,7 @@ dependencies { diff --git a/patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch index 7bebe79b88..0e52c845e6 100644 --- a/patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 1a2f03895f348e4c2620caef74f12cb1f41dec1b..463bd6c1327c2122b8c127a38399d80bf68ebdc0 100644 +index 4e0b6798754710e9fa598016938f033ae17b8a09..e9172da1b88ea57415df041178ca939550da83cb 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -688,16 +688,30 @@ public class CraftEventFactory { diff --git a/patches/server/0395-ExperienceOrbMergeEvent.patch b/patches/server/0395-ExperienceOrbMergeEvent.patch index 7f2db94033..98a256f164 100644 --- a/patches/server/0395-ExperienceOrbMergeEvent.patch +++ b/patches/server/0395-ExperienceOrbMergeEvent.patch @@ -9,7 +9,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 463bd6c1327c2122b8c127a38399d80bf68ebdc0..5954367915f2f68383d892d6927c9bfa1b739b77 100644 +index e9172da1b88ea57415df041178ca939550da83cb..dedc3cec245b120af3266e23cdf7ea8098f45e96 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -698,7 +698,7 @@ public class CraftEventFactory { diff --git a/patches/server/0430-Add-entity-liquid-API.patch b/patches/server/0430-Add-entity-liquid-API.patch index 137f3148f2..4cfcf96366 100644 --- a/patches/server/0430-Add-entity-liquid-API.patch +++ b/patches/server/0430-Add-entity-liquid-API.patch @@ -8,10 +8,10 @@ public net.minecraft.world.entity.Entity isInRain()Z public net.minecraft.world.entity.Entity isInBubbleColumn()Z diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index fa2cf604910977c0275f7731286618fe3c355a36..11d2fb9984f5d0cf91c8b3ae1153f0fcbb817a59 100644 +index 96f78f74433b4b54cf4ebec624649eca4f157602..eaa59959f4804d38ae486028c854ed63207fd3b9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1311,5 +1311,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1328,5 +1328,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason() { return getHandle().spawnReason; } diff --git a/patches/server/0433-Add-PrepareResultEvent.patch b/patches/server/0433-Add-PrepareResultEvent.patch index 7d404fbc9a..c95fcda531 100644 --- a/patches/server/0433-Add-PrepareResultEvent.patch +++ b/patches/server/0433-Add-PrepareResultEvent.patch @@ -94,7 +94,7 @@ index 9c2fe69ced7a46bbd8b0fbe10fa67d0a39b0f375..70ecc3f673ebd56b65ad901e10f40c28 private void setupRecipeList(Container input, ItemStack stack) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 5954367915f2f68383d892d6927c9bfa1b739b77..e614b847543df4581dbbc79e3ffb69aa7c55e9cc 100644 +index dedc3cec245b120af3266e23cdf7ea8098f45e96..e05b03b356d7a5de9f326a1004326326efd0e301 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1671,26 +1671,53 @@ public class CraftEventFactory { diff --git a/patches/server/0451-Add-BellRingEvent.patch b/patches/server/0451-Add-BellRingEvent.patch index d1b4164b88..e10d690b22 100644 --- a/patches/server/0451-Add-BellRingEvent.patch +++ b/patches/server/0451-Add-BellRingEvent.patch @@ -7,7 +7,7 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a village bell. Passes along the bell block and the player who rang it. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e614b847543df4581dbbc79e3ffb69aa7c55e9cc..63b738c1f511e4663cad698e616cdc1528ee8c6b 100644 +index e05b03b356d7a5de9f326a1004326326efd0e301..e18e733cd13b7b69170a839e78341f3f339afa09 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -367,10 +367,11 @@ public class CraftEventFactory { diff --git a/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index f72adda1b9..1030fbe503 100644 --- a/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -69,7 +69,7 @@ index 369298dfd437c1c83801f3d4ba63484ee1b969fe..ae2b95f53e875716489821dc9b0a3a35 if (entity instanceof Mob) { Mob entityinsentient = (Mob) entity; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 11d2fb9984f5d0cf91c8b3ae1153f0fcbb817a59..681a5d93933dcd02e857e260261b70e7252544a5 100644 +index eaa59959f4804d38ae486028c854ed63207fd3b9..2c4704fb85f29a02b7245d36e8e4383534c701f9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -579,7 +579,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0467-Entity-isTicking.patch b/patches/server/0467-Entity-isTicking.patch index 0467e6cc7c..0b46c939ad 100644 --- a/patches/server/0467-Entity-isTicking.patch +++ b/patches/server/0467-Entity-isTicking.patch @@ -19,10 +19,10 @@ index 71dc4112cb932c6b1305f0f22e99f069517cac08..cfdc8c37d41473300ca9a8c251e27cb2 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 681a5d93933dcd02e857e260261b70e7252544a5..4b826ff8c3c2bc07ab471557faf41a3398dbdfb9 100644 +index 2c4704fb85f29a02b7245d36e8e4383534c701f9..cacefccf15d68759ec26548ac1c10ee97e251ac4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1346,5 +1346,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1363,5 +1363,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public boolean isInLava() { return getHandle().isInLava(); } diff --git a/patches/server/0495-More-lightning-API.patch b/patches/server/0495-More-lightning-API.patch index 50620fb3ad..0a4adb0107 100644 --- a/patches/server/0495-More-lightning-API.patch +++ b/patches/server/0495-More-lightning-API.patch @@ -8,10 +8,10 @@ public net.minecraft.world.entity.LightningBolt life public net.minecraft.world.entity.LightningBolt flashes diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java -index a244385cc0c297d018e860d0b6e4570084d9d0e7..dbb435ec7a930c3b410fc4311f7eb0a4d2faa987 100644 +index b9a8a39fed91aa5bbcd3c9c05ba9f10e2b7ec889..ef5a5aed9e1b15a29fd3a97ccd502c40b1d865ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java -@@ -39,4 +39,38 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike +@@ -66,4 +66,23 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike return this.spigot; } // Spigot end @@ -29,24 +29,9 @@ index a244385cc0c297d018e860d0b6e4570084d9d0e7..dbb435ec7a930c3b410fc4311f7eb0a4 + } + + @Override -+ public int getLifeTicks() { -+ return getHandle().life; -+ } -+ -+ @Override -+ public void setLifeTicks(int lifeTicks) { -+ getHandle().life = lifeTicks; -+ } -+ -+ @Override + public @org.jetbrains.annotations.Nullable org.bukkit.entity.Entity getCausingEntity() { + final var cause = this.getHandle().getCause(); + return cause == null ? null : cause.getBukkitEntity(); + } -+ -+ @Override -+ public void setCausingPlayer(@org.jetbrains.annotations.Nullable org.bukkit.entity.Player causingPlayer) { -+ this.getHandle().setCause(causingPlayer == null ? null : ((CraftPlayer) causingPlayer).getHandle()); -+ } + // Paper end } diff --git a/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch index 097c1f9904..30dbaa1c3a 100644 --- a/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch +++ b/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 63b738c1f511e4663cad698e616cdc1528ee8c6b..8a0c2d37830b002e7dab8e2e0567f6d1e597d5fb 100644 +index e18e733cd13b7b69170a839e78341f3f339afa09..58ca3b4cbd2626e80f4474753508e8990311771e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -302,6 +302,10 @@ public class CraftEventFactory { diff --git a/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch index 20f3d70b06..a8c46e638d 100644 --- a/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch +++ b/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch @@ -32,10 +32,10 @@ index 7dd0570b2457c612484ab89a8efcedd094c4772c..b1ba2c1da9d7b59a5316574deb824740 } else { ItemStack itemstack = tileentitydispenser.getItem(i); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 8a0c2d37830b002e7dab8e2e0567f6d1e597d5fb..93946b9e5a7dc61f797e81fcff9c2cef86e61340 100644 +index 58ca3b4cbd2626e80f4474753508e8990311771e..bd230fa64b84fa4832e269e72e1ecfc04e6ee617 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1999,4 +1999,12 @@ public class CraftEventFactory { +@@ -1997,4 +1997,12 @@ public class CraftEventFactory { Bukkit.getPluginManager().callEvent(event); return event; } diff --git a/patches/server/0532-TODO-Registry-Modification-API.patch b/patches/server/0532-TODO-Registry-Modification-API.patch index ab0c200caa..613cd4823c 100644 --- a/patches/server/0532-TODO-Registry-Modification-API.patch +++ b/patches/server/0532-TODO-Registry-Modification-API.patch @@ -5,12 +5,12 @@ Subject: [PATCH] TODO Registry Modification API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java -index b42f74375cb2167b28ad8209889fc824e94cfad7..582e509dddfdf6e7b8a2d7310caba076c3bd7dc2 100644 +index 2d277092ea1e49d88129edeea619b1efa440c2e2..2530b09e6fc04c67ec18fcf4f786098bdba63552 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java @@ -62,6 +62,7 @@ public class CraftRegistry implements Registry { if (bukkitClass == TrimPattern.class) { - return new CraftRegistry<>(registryHolder.registryOrThrow(Registries.TRIM_PATTERN), CraftTrimPattern::new); + return new CraftRegistry<>(TrimPattern.class, registryHolder.registryOrThrow(Registries.TRIM_PATTERN), CraftTrimPattern::new); } + // TODO registry modification API diff --git a/patches/server/0533-Add-StructuresLocateEvent.patch b/patches/server/0533-Add-StructuresLocateEvent.patch index 9ad52d9134..465e85a5f2 100644 --- a/patches/server/0533-Add-StructuresLocateEvent.patch +++ b/patches/server/0533-Add-StructuresLocateEvent.patch @@ -7,7 +7,7 @@ Co-authored-by: Jake Potrebic diff --git a/src/main/java/io/papermc/paper/world/structure/PaperConfiguredStructure.java b/src/main/java/io/papermc/paper/world/structure/PaperConfiguredStructure.java new file mode 100644 -index 0000000000000000000000000000000000000000..09837f6e6c6ab8a1df2aacdb86646993123dd424 +index 0000000000000000000000000000000000000000..2667067fd13f61e0464ba88ae4e4a7078351d1a8 --- /dev/null +++ b/src/main/java/io/papermc/paper/world/structure/PaperConfiguredStructure.java @@ -0,0 +1,35 @@ @@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..09837f6e6c6ab8a1df2aacdb86646993 + public static final class LegacyRegistry extends CraftRegistry { + + public LegacyRegistry(final Registry minecraftRegistry) { -+ super(minecraftRegistry, LegacyRegistry::minecraftToBukkit); ++ super(ConfiguredStructure.class, minecraftRegistry, LegacyRegistry::minecraftToBukkit); + } + + private static @Nullable ConfiguredStructure minecraftToBukkit(NamespacedKey key, Structure nms) { @@ -76,11 +76,11 @@ index 4da303d7e15496f04f0e27bfb613176bc2a72b76..3c7920721914588a3e7eaf1faff46f73 Map>> map = new Object2ObjectArrayMap(); Iterator iterator = structures.iterator(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java -index 582e509dddfdf6e7b8a2d7310caba076c3bd7dc2..3d17c2b6fdfe24cf9aed90649264bdb55407c35b 100644 +index 2530b09e6fc04c67ec18fcf4f786098bdba63552..2c23b3b2c84f61b1c64ffe4f99c09299019cf9bf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java @@ -63,6 +63,11 @@ public class CraftRegistry implements Registry { - return new CraftRegistry<>(registryHolder.registryOrThrow(Registries.TRIM_PATTERN), CraftTrimPattern::new); + return new CraftRegistry<>(TrimPattern.class, registryHolder.registryOrThrow(Registries.TRIM_PATTERN), CraftTrimPattern::new); } // TODO registry modification API + // Paper start - remove this after a while along with all ConfiguredStructure stuff diff --git a/patches/server/0539-Implement-BlockPreDispenseEvent.patch b/patches/server/0539-Implement-BlockPreDispenseEvent.patch index 8f6bfbc56b..8367e67888 100644 --- a/patches/server/0539-Implement-BlockPreDispenseEvent.patch +++ b/patches/server/0539-Implement-BlockPreDispenseEvent.patch @@ -17,10 +17,10 @@ index 5cf5b451fecb1ff04d0c4aca1fb0b702c7f99bdf..9b1e51c1d95da885c80c6d05000d8343 tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack)); } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 93946b9e5a7dc61f797e81fcff9c2cef86e61340..4bce7c239e33f675fef71416d0c825e6dc874f59 100644 +index bd230fa64b84fa4832e269e72e1ecfc04e6ee617..a422cf5f09d79a06d2e25f59298dc6d732bbd10c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2006,5 +2006,11 @@ public class CraftEventFactory { +@@ -2004,5 +2004,11 @@ public class CraftEventFactory { io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block); return event.callEvent(); } diff --git a/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch index cbeafdb549..fe37d5fd53 100644 --- a/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -122,7 +122,7 @@ index 16784fcc853e23689a854e7dc6c03ed8182a164e..4eb97572a97a8d98af37c4223f42fc63 flag1 = true; } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 4bce7c239e33f675fef71416d0c825e6dc874f59..932035fe739404a1bafe05e9de71aa570ffa3726 100644 +index a422cf5f09d79a06d2e25f59298dc6d732bbd10c..f9628163c62d39b5ffc7139c110890fc1bccc223 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1594,8 +1594,10 @@ public class CraftEventFactory { diff --git a/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch index 63c3ff4747..e811b5c0a7 100644 --- a/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 932035fe739404a1bafe05e9de71aa570ffa3726..fc99df6033f4168ac1bc3ee7da11ac36d827f7bf 100644 +index f9628163c62d39b5ffc7139c110890fc1bccc223..9d49cdb3f40b4dada89001ba1b63963bc292bf46 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -451,13 +451,30 @@ public class CraftEventFactory { diff --git a/patches/server/0554-Expose-Tracked-Players.patch b/patches/server/0554-Expose-Tracked-Players.patch index d0b87766ad..c2235d9c2f 100644 --- a/patches/server/0554-Expose-Tracked-Players.patch +++ b/patches/server/0554-Expose-Tracked-Players.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose Tracked Players diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 4b826ff8c3c2bc07ab471557faf41a3398dbdfb9..e7686273141637e5c7328703a33224b4042b6e2b 100644 +index cacefccf15d68759ec26548ac1c10ee97e251ac4..a63fb984e905e51dc100eba30cbd71cac173ae22 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1351,5 +1351,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1368,5 +1368,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public boolean isTicking() { return getHandle().isTicking(); } diff --git a/patches/server/0627-Missing-Entity-API.patch b/patches/server/0627-Missing-Entity-API.patch index 230b5aa981..c4be6e1e34 100644 --- a/patches/server/0627-Missing-Entity-API.patch +++ b/patches/server/0627-Missing-Entity-API.patch @@ -123,7 +123,7 @@ index 39ed3ca76d6b64ef3917280ec822721cc02afada..86b437836cb4b1f6e8ca9acd5f1f93b9 this.leader = null; } diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 9c7c59d1230110010033a9c9959b375eac3ebc2b..7c81c6ebe200a029a5944b65827223e81ab08938 100644 +index 41f5b4fc4a4b7d2a54b08869d4afa450f34caf91..63678ff2e40d2ba0a5e97539394b18f97368f8cf 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -546,11 +546,13 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { @@ -658,7 +658,7 @@ index fc0f0e841dc974d080e1abb9bbafb5165801131f..d657fd2c507a5b215aeab0a5f3e9c2ee + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index e7686273141637e5c7328703a33224b4042b6e2b..367d01e22ab423b17a0b3d4732e507f8ae2979ea 100644 +index a63fb984e905e51dc100eba30cbd71cac173ae22..2ea8b72ef450b60ec6d7ec10f3f94d2154e06670 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -232,10 +232,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0666-Add-critical-damage-API.patch b/patches/server/0666-Add-critical-damage-API.patch index b4fe4d7fb3..1042d66937 100644 --- a/patches/server/0666-Add-critical-damage-API.patch +++ b/patches/server/0666-Add-critical-damage-API.patch @@ -71,7 +71,7 @@ index f70f0764d9743dbfa2ead4c90d0df3dbc107672d..02574c777047b8e1375aa91e0cd75c73 int k = entity.getRemainingFireTicks(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index fc99df6033f4168ac1bc3ee7da11ac36d827f7bf..6c7f7ae5208e9fa58694f202f048d2f3524b27a4 100644 +index 9d49cdb3f40b4dada89001ba1b63963bc292bf46..bee74b498ebf622ab8d4d810cd07fd1a06c06da2 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1018,7 +1018,7 @@ public class CraftEventFactory { diff --git a/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch index 5bbc3a32d7..c965ae0cd0 100644 --- a/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch @@ -27,10 +27,10 @@ index 3b7e54b4348f0486e43b4f7930ada0a16e989650..6512c3ca611233f7541c1d0119521e05 return this.isPassenger() ? false : this.saveAsPassenger(nbt); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 367d01e22ab423b17a0b3d4732e507f8ae2979ea..ad0ea49e2ee26d20ac93771a2353b186d0ccd41d 100644 +index 2ea8b72ef450b60ec6d7ec10f3f94d2154e06670..3d9ee3a7305b0575387e719ac4062c4a355d63e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1370,5 +1370,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1387,5 +1387,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } return set; } diff --git a/patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch index f48185f3ff..e184da95bc 100644 --- a/patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Use Velocity compression and cipher natives diff --git a/build.gradle.kts b/build.gradle.kts -index a4c39e1302dff6ec43e84e3d04f234733b81a85b..a46a627d9fb07fa43c95ca9eb48ba87302f66173 100644 +index 56b1eb0136777931b99524edc6077d138f41e023..6528532d9e0f3d892fe81dc899f37d7cf611fecb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,6 +41,11 @@ dependencies { - runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1") runtimeOnly("com.mysql:mysql-connector-j:8.1.0") runtimeOnly("com.lmax:disruptor:3.4.4") // Paper + // Paper start - Use Velocity cipher diff --git a/patches/server/0708-Preserve-overstacked-loot.patch b/patches/server/0708-Preserve-overstacked-loot.patch index 45b5a6355e..004c7c6f77 100644 --- a/patches/server/0708-Preserve-overstacked-loot.patch +++ b/patches/server/0708-Preserve-overstacked-loot.patch @@ -10,10 +10,10 @@ chunk bans via the large amount of NBT created by unstacking the items. Fixes GH-5140 and GH-4748. diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java -index c21dd258d749c28e509c86a70c1f85712aeeda9e..5373070034cefbbfa797c675ce698637b526a2c8 100644 +index 214215d203892b8009595539f25ce26e8752debd..05af6fa0585406c4922d2eb174f7e53f4269acd6 100644 --- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java +++ b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java -@@ -67,9 +67,10 @@ public class LootTable { +@@ -68,9 +68,10 @@ public class LootTable { } public static Consumer createStackSplitter(ServerLevel world, Consumer consumer) { diff --git a/patches/server/0735-Entity-powdered-snow-API.patch b/patches/server/0735-Entity-powdered-snow-API.patch index 5f73447eb1..8ea727a6aa 100644 --- a/patches/server/0735-Entity-powdered-snow-API.patch +++ b/patches/server/0735-Entity-powdered-snow-API.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Entity powdered snow API public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index ad0ea49e2ee26d20ac93771a2353b186d0ccd41d..e4c587d6304492d936ec3d84303c4cf3b093a2b0 100644 +index 3d9ee3a7305b0575387e719ac4062c4a355d63e8..853561c0b3507808c70f4274812407d1ffb37504 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1380,5 +1380,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1397,5 +1397,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { this.entity.setRot(location.getYaw(), location.getPitch()); return !this.entity.valid && this.entity.level().addFreshEntity(this.entity, reason); } diff --git a/patches/server/0757-Freeze-Tick-Lock-API.patch b/patches/server/0757-Freeze-Tick-Lock-API.patch index 5c78304b29..f53fd870ca 100644 --- a/patches/server/0757-Freeze-Tick-Lock-API.patch +++ b/patches/server/0757-Freeze-Tick-Lock-API.patch @@ -59,7 +59,7 @@ index 58186adba67a43188784efffd4bc9c8d98ac2848..7c686b6734d52287c3c41bfe09427616 if (this.isInPowderSnow && this.canFreeze()) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index e4c587d6304492d936ec3d84303c4cf3b093a2b0..03142d4eaa3ebdf590ec1131f28690da9c6fe748 100644 +index 853561c0b3507808c70f4274812407d1ffb37504..c924ee182c150feca61deab9b8cc54806a23c49a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -668,6 +668,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch index ba9af2dff6..5d821619a6 100644 --- a/patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch +++ b/patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch @@ -196,7 +196,7 @@ index b13d89b1516130507402cd3b4bdb9f3c2a36e807..936644ec4a57e51a1c11a5bf4e8449ab } // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 6c7f7ae5208e9fa58694f202f048d2f3524b27a4..2581c8f91e6c7eca246d11220cba0187b9a2143f 100644 +index bee74b498ebf622ab8d4d810cd07fd1a06c06da2..a017858e05d6068a06feb4bea0e6ef7ea1f0966a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1385,11 +1385,11 @@ public class CraftEventFactory { diff --git a/patches/server/0811-Add-support-for-Proxy-Protocol.patch b/patches/server/0811-Add-support-for-Proxy-Protocol.patch index 99cf00a610..5c2e95e96e 100644 --- a/patches/server/0811-Add-support-for-Proxy-Protocol.patch +++ b/patches/server/0811-Add-support-for-Proxy-Protocol.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol diff --git a/build.gradle.kts b/build.gradle.kts -index a46a627d9fb07fa43c95ca9eb48ba87302f66173..683159586641dd9aa42ae96fa51602469755723f 100644 +index 6528532d9e0f3d892fe81dc899f37d7cf611fecb..7afd8302e8407548c21e919f929125213635b21d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,6 +30,7 @@ dependencies { diff --git a/patches/server/0831-Fix-Bee-flower-NPE.patch b/patches/server/0831-Fix-Bee-flower-NPE.patch index 8bf7400efa..bbc40a996b 100644 --- a/patches/server/0831-Fix-Bee-flower-NPE.patch +++ b/patches/server/0831-Fix-Bee-flower-NPE.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Bee flower NPE diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 7c81c6ebe200a029a5944b65827223e81ab08938..e06d5eea4bc81be264a1f5d5fad2d4548c4ae8d2 100644 +index 63678ff2e40d2ba0a5e97539394b18f97368f8cf..9a7956befc346e1b58f064213800fd099a052fc6 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -803,7 +803,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { diff --git a/patches/server/0833-More-Teleport-API.patch b/patches/server/0833-More-Teleport-API.patch index 99f281278b..d0377d5188 100644 --- a/patches/server/0833-More-Teleport-API.patch +++ b/patches/server/0833-More-Teleport-API.patch @@ -31,7 +31,7 @@ index b1be147250d3850930e103a2fa2823a6c992f0dd..675467a6552cfc1f951e7c81a9be0d42 d0 = to.getX(); d1 = to.getY(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 03142d4eaa3ebdf590ec1131f28690da9c6fe748..863d5a2c6729f8675b03a0575a7eb69ccaf04f4b 100644 +index c924ee182c150feca61deab9b8cc54806a23c49a..6fdde2f766b91833dc2318526f84e96cb26233b4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -566,15 +566,36 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch index e60ad26bb8..380c4d5c5d 100644 --- a/patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch +++ b/patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch @@ -8,28 +8,6 @@ and constructing an entity off the main thread should be supported. Some entities (for whatever reason) use the level's random in some places. -diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index e06d5eea4bc81be264a1f5d5fad2d4548c4ae8d2..55026e1731e41b4e3e4c6a8fef5d96a32051a556 100644 ---- a/src/main/java/net/minecraft/world/entity/animal/Bee.java -+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java -@@ -1029,7 +1029,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { - - BeeGoToHiveGoal() { - super(); -- this.travellingTicks = Bee.this.level().random.nextInt(10); -+ this.travellingTicks = Bee.this./* level(). */random.nextInt(10); // Paper - use entity random - this.blacklistedTargets = Lists.newArrayList(); - this.setFlags(EnumSet.of(Goal.Flag.MOVE)); - } -@@ -1146,7 +1146,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { - - BeeGoToKnownFlowerGoal() { - super(); -- this.travellingTicks = Bee.this.level().random.nextInt(10); -+ this.travellingTicks = Bee.this./* level(). */random.nextInt(10); // Paper - use entity random - this.setFlags(EnumSet.of(Goal.Flag.MOVE)); - } - diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java index d70abca10e84b86310ce5e4d72eb939331dc00e4..1a06d8c839e94fe2c1920035d606b62e0dc5cfba 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java diff --git a/patches/server/0840-Collision-API.patch b/patches/server/0840-Collision-API.patch index 73e98382d8..4c9bd750bb 100644 --- a/patches/server/0840-Collision-API.patch +++ b/patches/server/0840-Collision-API.patch @@ -22,10 +22,10 @@ index 57bb76050919d187adef4bfa8b21416a70867d23..254cdf5efe85583c5ef126d46af7c524 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 863d5a2c6729f8675b03a0575a7eb69ccaf04f4b..f4a9b72f76742b128632183720866df9283ca753 100644 +index 6fdde2f766b91833dc2318526f84e96cb26233b4..8733255559e63d8709d2502e58f16decdf1714ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1418,4 +1418,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1435,4 +1435,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed. } // Paper end diff --git a/patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch index e36430b7ef..4f0d9f51f2 100644 --- a/patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch +++ b/patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fire EntityChangeBlockEvent in more places Co-authored-by: ChristopheG <61288881+chrisgdt@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/LightningBolt.java b/src/main/java/net/minecraft/world/entity/LightningBolt.java -index 80740ca823915fb2c854f13445d81964e0e971e5..255fb5e922c63130708e4bcab208b4db52a58387 100644 +index 21cdbd96ecbe2a6c8f7b2e3f20aed6c175f3732b..471275c5362b61ce8b5b9dd5c85b3e93cabd3f76 100644 --- a/src/main/java/net/minecraft/world/entity/LightningBolt.java +++ b/src/main/java/net/minecraft/world/entity/LightningBolt.java @@ -98,7 +98,7 @@ public class LightningBolt extends Entity { diff --git a/patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch index 13e208e234..21d5cb0b3c 100644 --- a/patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch +++ b/patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch @@ -30,7 +30,7 @@ index 14bbc86bbaad49b2af16f3b171eb667c28eda702..34ecfb89372f459117db99d57a7edd6f this.interactResult = event.useItemInHand() == Event.Result.DENY; this.interactPosition = blockposition.immutable(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2581c8f91e6c7eca246d11220cba0187b9a2143f..b00547dea90673a43715197bc5873cf94cfbd038 100644 +index a017858e05d6068a06feb4bea0e6ef7ea1f0966a..f29ae4e617b2ed37e2c0f14a81e019125b078aee 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -544,7 +544,13 @@ public class CraftEventFactory { diff --git a/patches/server/0900-Add-Sneaking-API-for-Entities.patch b/patches/server/0900-Add-Sneaking-API-for-Entities.patch index f94fb0ad22..2ab0b02578 100644 --- a/patches/server/0900-Add-Sneaking-API-for-Entities.patch +++ b/patches/server/0900-Add-Sneaking-API-for-Entities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Sneaking API for Entities diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index f4a9b72f76742b128632183720866df9283ca753..c612c97ca33b445c019ffa8d5074038f4a624db7 100644 +index 8733255559e63d8709d2502e58f16decdf1714ae..35ce9507933487935da8ae8eff4e94925b1abf76 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1201,6 +1201,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1218,6 +1218,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return Pose.values()[this.getHandle().getPose().ordinal()]; } diff --git a/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch index 8f3fb0e7f4..765fd43e22 100644 --- a/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch +++ b/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch @@ -130,7 +130,7 @@ index da4609caecc8183d02c301c7cedbca52ed39323f..716021520c228b5bbced525b751f5d41 // See BlockStateFactory#createBlockState(World, BlockPosition, IBlockData, TileEntity) private static CraftBlockState getBlockState(World world, BlockPos blockPosition, net.minecraft.world.level.block.state.BlockState blockData, BlockEntity tileEntity) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index b00547dea90673a43715197bc5873cf94cfbd038..4d96082a3135406f63c6e02e34d8bf6b2d184eb9 100644 +index f29ae4e617b2ed37e2c0f14a81e019125b078aee..70a873c4a44dea055c091e1ed57cb9c6e3974f1f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1020,7 +1020,7 @@ public class CraftEventFactory { diff --git a/patches/server/0915-Add-Entity-Body-Yaw-API.patch b/patches/server/0915-Add-Entity-Body-Yaw-API.patch index e4d7a9ccab..97904a1b28 100644 --- a/patches/server/0915-Add-Entity-Body-Yaw-API.patch +++ b/patches/server/0915-Add-Entity-Body-Yaw-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index c612c97ca33b445c019ffa8d5074038f4a624db7..56fe7baf22b040af77a08b7ebddad3aa8a53185f 100644 +index 35ce9507933487935da8ae8eff4e94925b1abf76..5cf469a1bba2b09dcd28cf6bc506e8b7a8e2162f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1429,6 +1429,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1446,6 +1446,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public boolean isInPowderedSnow() { return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed. } diff --git a/patches/server/0918-Add-EntityFertilizeEggEvent.patch b/patches/server/0918-Add-EntityFertilizeEggEvent.patch index e2025f7a2c..3970cb4f32 100644 --- a/patches/server/0918-Add-EntityFertilizeEggEvent.patch +++ b/patches/server/0918-Add-EntityFertilizeEggEvent.patch @@ -69,10 +69,10 @@ index 36b3945832733b5ad66d25aa3a31335234d2acff..47a5125e44cea1ece84657cdb874807f this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F); } // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 4d96082a3135406f63c6e02e34d8bf6b2d184eb9..be120d2d5dd58512a102ea670761b9336a48a8c3 100644 +index 70a873c4a44dea055c091e1ed57cb9c6e3974f1f..c562b5b4048e68a62d114a4a928dff3c956d679a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2051,4 +2051,29 @@ public class CraftEventFactory { +@@ -2049,4 +2049,29 @@ public class CraftEventFactory { return event.callEvent(); } // Paper end diff --git a/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch index 0b43d09dfa..7c982f3fd2 100644 --- a/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch +++ b/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index be120d2d5dd58512a102ea670761b9336a48a8c3..87266f10b5922327060dbe910010e76559be8ca6 100644 +index c562b5b4048e68a62d114a4a928dff3c956d679a..82a474a09905e9858e0a7b4b00839f5ad5e9adbb 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1060,6 +1060,11 @@ public class CraftEventFactory { diff --git a/patches/server/0944-Expand-PlayerItemMendEvent.patch b/patches/server/0944-Expand-PlayerItemMendEvent.patch index c5799173eb..b337f6a3f5 100644 --- a/patches/server/0944-Expand-PlayerItemMendEvent.patch +++ b/patches/server/0944-Expand-PlayerItemMendEvent.patch @@ -51,7 +51,7 @@ index e91b45268d96dfa79cd6472824b203e5250df0a5..f036f8bbb5861edec3a05d4c96fc495d } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 87266f10b5922327060dbe910010e76559be8ca6..862b38e552615eba73841bb7d1e3e87185eb6a5a 100644 +index 82a474a09905e9858e0a7b4b00839f5ad5e9adbb..e4ee6425e6f6c8546e3af8889a67f08d61b1dc94 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1296,10 +1296,10 @@ public class CraftEventFactory { diff --git a/patches/server/0962-Call-missing-BlockDispenseEvent.patch b/patches/server/0962-Call-missing-BlockDispenseEvent.patch index 9d8ee0fc19..c8dd040c48 100644 --- a/patches/server/0962-Call-missing-BlockDispenseEvent.patch +++ b/patches/server/0962-Call-missing-BlockDispenseEvent.patch @@ -50,10 +50,10 @@ index c0baec6ae9bd90410f47aa04d7c7704233375d1a..e9b748a81ec223a701b56d2dc890c9eb for (int k = 0; k < 5; ++k) { worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 862b38e552615eba73841bb7d1e3e87185eb6a5a..bef88faefc8023a9640b843eaa5216594d0c4386 100644 +index e4ee6425e6f6c8546e3af8889a67f08d61b1dc94..f08abdff3e190391d2b65e32e45eb391aeb4f346 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2057,6 +2057,32 @@ public class CraftEventFactory { +@@ -2055,6 +2055,32 @@ public class CraftEventFactory { } // Paper end diff --git a/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch index aa8cb47353..24e77389a5 100644 --- a/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch +++ b/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index bef88faefc8023a9640b843eaa5216594d0c4386..11f413f6c06a7da58c9411e4e240d48099774356 100644 +index f08abdff3e190391d2b65e32e45eb391aeb4f346..def4d88b227b8764a84392843a2f0a026f9ee3fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -720,7 +720,10 @@ public class CraftEventFactory { diff --git a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch index f8d7e5e478..fce6634bda 100644 --- a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch +++ b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch @@ -1305,7 +1305,7 @@ index f8465d3e8fd2ad877d8f5614a815d6e528cc4fa0..f1ae1718e8ccfe7098740a2f3ec038bd ConfigurationSerialization.registerClass(CraftOfflinePlayer.class); ConfigurationSerialization.registerClass(CraftPlayerProfile.class); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 56fe7baf22b040af77a08b7ebddad3aa8a53185f..39940331a3322213856b0ef4ca71f00965d05b4f 100644 +index 5cf469a1bba2b09dcd28cf6bc506e8b7a8e2162f..b1f6915206acf6ba85b719737861babc552b5183 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -207,6 +207,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch index 1a0045c1c8..0947ac0e31 100644 --- a/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch +++ b/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch @@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different methods depending on the implementation of Entity you were working with. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 39940331a3322213856b0ef4ca71f00965d05b4f..bcd25a26bab436504c58edc1f5fb0a0337459464 100644 +index b1f6915206acf6ba85b719737861babc552b5183..c83d0461ef14ef0df8428387d0d8eac5ad010054 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1485,4 +1485,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1502,4 +1502,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return !this.getHandle().level().noCollision(this.getHandle(), aabb); } // Paper End - Collision API diff --git a/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch index 8ba4e79d8f..d57e36ca47 100644 --- a/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch +++ b/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch @@ -18,7 +18,7 @@ index 9a17193c9fe26c9c0390906b4c1f9d619ccba249..618ab9a2903f6d4139acd4aaa2e6db0a if (blockEvent.isCancelled()) { // Let the client know the block still exists diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 11f413f6c06a7da58c9411e4e240d48099774356..37bba53fe2c55668a8e280b669fc138d4413a405 100644 +index def4d88b227b8764a84392843a2f0a026f9ee3fc..3c8160bd5f235f386edd938603ff70d4b73c047e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -650,13 +650,13 @@ public class CraftEventFactory { diff --git a/patches/server/1002-Expand-Pose-API.patch b/patches/server/1002-Expand-Pose-API.patch index 67a17d8d1c..6dc593e987 100644 --- a/patches/server/1002-Expand-Pose-API.patch +++ b/patches/server/1002-Expand-Pose-API.patch @@ -25,10 +25,10 @@ index 426023af3cbed9c17048e669c87a1c66bda4ad1b..f20ae9153b7098980ce6c0e75fcbbb4d if (pose == this.getPose()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index bcd25a26bab436504c58edc1f5fb0a0337459464..e932cfac619c30b8c7444a9fa41e0403a6eadf6a 100644 +index c83d0461ef14ef0df8428387d0d8eac5ad010054..315d8260e196709ed9084272aa640f11e327c0a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1226,6 +1226,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1243,6 +1243,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public boolean isSneaking() { return this.getHandle().isShiftKeyDown(); } diff --git a/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch index ba1a92cd25..a0ba91ffae 100644 --- a/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch +++ b/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch @@ -79,7 +79,7 @@ index 5b01ffcdbfff7dbd05143cb08479c90e9b29dfba..017e97c1618b8ee4640b36a0ec1b0702 if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper player.containerMenu = container; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 37bba53fe2c55668a8e280b669fc138d4413a405..50fed722bbba5c663e4be33a179ea75dfa2dd9e9 100644 +index 3c8160bd5f235f386edd938603ff70d4b73c047e..193ad79f57255b1ea4cf7930071b4f4988dc2b04 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1415,10 +1415,21 @@ public class CraftEventFactory { diff --git a/patches/server/1035-Fix-creating-the-reverse-map-for-loot-table-keys.patch b/patches/server/1035-Fix-creating-the-reverse-map-for-loot-table-keys.patch deleted file mode 100644 index d429b016f2..0000000000 --- a/patches/server/1035-Fix-creating-the-reverse-map-for-loot-table-keys.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Tue, 26 Sep 2023 18:32:49 -0700 -Subject: [PATCH] Fix creating the reverse map for loot table keys - - -diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootDataManager.java b/src/main/java/net/minecraft/world/level/storage/loot/LootDataManager.java -index dd375fffa727db76fa989248b9b836960974c372..3563fdb8f8d3dbaabc611ab5cdba1d771406b336 100644 ---- a/src/main/java/net/minecraft/world/level/storage/loot/LootDataManager.java -+++ b/src/main/java/net/minecraft/world/level/storage/loot/LootDataManager.java -@@ -30,7 +30,7 @@ public class LootDataManager implements PreparableReloadListener, LootDataResolv - public static final LootDataId EMPTY_LOOT_TABLE_KEY = new LootDataId<>(LootDataType.TABLE, BuiltInLootTables.EMPTY); - private Map, ?> elements = Map.of(); - private Multimap, ResourceLocation> typeKeys = ImmutableMultimap.of(); -- public Map lootTableToKey = ImmutableMap.of(); // CraftBukkit -+ public Map lootTableToKey = ImmutableMap.of(); // CraftBukkit // Paper - only store loot tables because those don't override equals and hashCode - - public LootDataManager() {} - -@@ -101,8 +101,14 @@ public class LootDataManager implements PreparableReloadListener, LootDataResolv - this.elements = map1; - this.typeKeys = com_google_common_collect_immutablemultimap_builder.build(); - // CraftBukkit start - build a reversed registry map -- ImmutableMap.Builder lootTableToKeyBuilder = ImmutableMap.builder(); -- this.elements.forEach((key, lootTable) -> lootTableToKeyBuilder.put((Object) lootTable, key.location())); -+ // Paper start - only create a map for loot tables -+ ImmutableMap.Builder lootTableToKeyBuilder = ImmutableMap.builder(); -+ this.elements.forEach((lootDataId, value) -> { -+ if (lootDataId.type() == LootDataType.TABLE && value instanceof LootTable lootTable) { -+ lootTableToKeyBuilder.put(lootTable, lootDataId.location()); -+ } -+ }); -+ // Paper end - this.lootTableToKey = lootTableToKeyBuilder.build(); - // CraftBukkit end - } diff --git a/work/Bukkit b/work/Bukkit index 044d4ee93f..09b1c123eb 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 044d4ee93f77d1e9d82c91155d38742640d557f4 +Subproject commit 09b1c123ebe4fe06ced3a6277a100aa8d4f55fcc diff --git a/work/CraftBukkit b/work/CraftBukkit index 99aafc222b..1bf30a4e90 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 99aafc222b5fdc36dc0bc124080d114dcae06cb3 +Subproject commit 1bf30a4e9019c8a6444e1460135c6c33d72f45a2 diff --git a/work/Spigot b/work/Spigot index a0f3d48691..224dad51c7 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit a0f3d48691557f3f6e528fc62cd7d48a1974f016 +Subproject commit 224dad51c7c6dbae96729d15807094bff1283ac4