Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 12:05:53 +01:00
Code Issues Projects Releases Wiki Activity

move patch relying on TraceUtil to after its creation

Browse Source
This commit is contained in:
Jake Potrebic 2022-02-28 18:44:07 -08:00 committed by Jason Penilla
parent fbe43d6a1d
commit 3526f22211
No known key found for this signature in database
GPG Key ID: 0E75A301420E48F8
42 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
patches/server/0376-Validate-tripwire-hook-placement-before-update.patch → patches/server/0375-Validate-tripwire-hook-placement-before-update.patch
View File

4
patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch → patches/server/0376-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add option to allow iron golems to spawn in air
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 67dcc28e5c5f6bdcafaea4bfe317203ddee09454..e0ebea2f62db5d0723aa353db49cdc3854aa5dd7 100644 index 5ba23152d2c7e45a824d49246706aa98c5d535ba..4c49a7a686ad1ff386999c21fa25acd30a615abf 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -423,6 +423,11 @@ public class PaperWorldConfig { @@ -423,6 +423,11 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index 67dcc28e5c5f6bdcafaea4bfe317203ddee09454..e0ebea2f62db5d0723aa353db49cdc38
private void armorStandEntityLookups() { private void armorStandEntityLookups() {
armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true); armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
index b73968d0aa35d42db3cfecbbb056f24d87fb5cf5..d6bff18a60e1b0b507a3797742bfafff2fad10d2 100644 index 3e4241d83ec26e575dcdbd0f7fb6b1edbf0b2d05..8299b48bad7a38d4310ca93b1de37d6c9170fc09 100644
--- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
@@ -323,7 +323,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob { @@ -323,7 +323,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {

2
patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch → patches/server/0377-Configurable-chance-of-villager-zombie-infection.patch
View File

@ -24,7 +24,7 @@ index 4c49a7a686ad1ff386999c21fa25acd30a615abf..c9d9461695d95e227f41b894b42b8be8
private void lightQueueSize() { private void lightQueueSize() {
lightQueueSize = getInt("light-queue-size", lightQueueSize); lightQueueSize = getInt("light-queue-size", lightQueueSize);
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index a54af7c5b970102e8ff7f46bf4dd34b19faf3b8a..de140adee6679e27598ecd7fe292cd657c7af303 100644 index 996613d75f66d97c3bd5241ca1c1346b92ec06dd..0ca58915b6b2eaf6a9765ba75d3e0773690ea040 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -449,10 +449,13 @@ public class Zombie extends Monster { @@ -449,10 +449,13 @@ public class Zombie extends Monster {

0
patches/server/0379-Optimise-Chunk-getFluid.patch → patches/server/0378-Optimise-Chunk-getFluid.patch
View File

2
patches/server/0380-Set-spigots-verbose-world-setting-to-false-by-def.patch → patches/server/0379-Set-spigots-verbose-world-setting-to-false-by-def.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Set spigots verbose world setting to false by def
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 58aaf0d98cbd6814ecdf00f46f8ff9fc7901006c..9f7541cb62600f022da75cba74731ff4e57f7f36 100644 index d4f035aca1d63596fd52b21e34c69e8d08e24e7a..32f8a6aed0f69ad07ab5b42fee38a3471a59d426 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -20,7 +20,7 @@ public class SpigotWorldConfig @@ -20,7 +20,7 @@ public class SpigotWorldConfig

0
patches/server/0381-Add-tick-times-API-and-mspt-command.patch → patches/server/0380-Add-tick-times-API-and-mspt-command.patch
View File

0
patches/server/0382-Expose-MinecraftServer-isRunning.patch → patches/server/0381-Expose-MinecraftServer-isRunning.patch
View File

2
patches/server/0383-Add-Raw-Byte-ItemStack-Serialization.patch → patches/server/0382-Add-Raw-Byte-ItemStack-Serialization.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
Serializes using NBT which is safer for server data migrations than bukkits format. Serializes using NBT which is safer for server data migrations than bukkits format.
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 99322a92b16010ed2ed2505067096e6baef2f616..92cf689c0c2a6602a42319d0a665b3635ca88da5 100644 index 7739b98398ee08b10c545cee6f9bd2c698a38fe2..6c2d35ab30285ffdd0e2ceda8af1293cb140f4d0 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -422,6 +422,53 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -422,6 +422,53 @@ public final class CraftMagicNumbers implements UnsafeValues {

0
patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch → patches/server/0383-Pillager-patrol-spawn-settings-and-per-player-option.patch
View File

0
patches/server/0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch → patches/server/0384-Remote-Connections-shouldn-t-hold-up-shutdown.patch
View File

0
patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch → patches/server/0385-Do-not-allow-bees-to-load-chunks-for-beehives.patch
View File

0
patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch → patches/server/0386-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
View File

0
patches/server/0388-Don-t-tick-dead-players.patch → patches/server/0387-Don-t-tick-dead-players.patch
View File

0
patches/server/0389-Dead-Player-s-shouldn-t-be-able-to-move.patch → patches/server/0388-Dead-Player-s-shouldn-t-be-able-to-move.patch
View File

2
patches/server/0390-Optimize-Collision-to-not-load-chunks.patch → patches/server/0389-Optimize-Collision-to-not-load-chunks.patch
View File

@ -26,7 +26,7 @@ index 3c176d48e6b1a8e165b5860cd443b36c65397ce9..c909163f664875bded56656ad3c0ca6c
entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
} }
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b254affe962442c9363e41787454697c509c1cab..61fe669b567a3af5bfb6bc1c80f53b6abfde68ce 100644 index 2983a5dfc781f40f345a8ca88c83c6af44ea2c7c..03ead8423d022f91f849990b6167d86fec066361 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -174,6 +174,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i @@ -174,6 +174,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i

0
patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch → patches/server/0390-Don-t-move-existing-players-to-world-spawn.patch
View File

2
patches/server/0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch → patches/server/0391-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
View File

@ -47,7 +47,7 @@ index 6667ecc4b7eded4e20a415cef1e1b1179e6710b8..4379b9948f1eecfe6fd7dea98e298ad5
protected int adjustedTickDelay(int ticks) { protected int adjustedTickDelay(int ticks) {
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
index 2bb32378b19a21c94ff3ec8ed32fc9d6f0ad0fdb..7fdc1cbd04a5bba9648272985f51c849b07b8223 100644 index ef8fe11bcda9fb8365d2c7efb2e088727dd849d9..c77fad612ba99663af2ec4418e3c2d68752dc2c8 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
@@ -30,10 +30,12 @@ public class GoalSelector { @@ -30,10 +30,12 @@ public class GoalSelector {

0
patches/server/0393-Improved-Watchdog-Support.patch → patches/server/0392-Improved-Watchdog-Support.patch
View File

2
patches/server/0394-Optimize-Pathfinding.patch → patches/server/0393-Optimize-Pathfinding.patch
View File

@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as
arrow attacks. arrow attacks.
diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
index 9fba89aa8b1c257cdc3a63a5bd137320d66a37ec..b06789336098233b642b769b0fd60e740459874c 100644 index 7991baa181d60ac037fd859278d00274ddb42be8..b47cd6d8ed02875bd9af54d27b7c1cda340e7f9f 100644
--- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
@@ -189,9 +189,29 @@ public abstract class PathNavigation { @@ -189,9 +189,29 @@ public abstract class PathNavigation {

0
patches/server/0395-Reduce-Either-Optional-allocation.patch → patches/server/0394-Reduce-Either-Optional-allocation.patch
View File

0
patches/server/0396-Reduce-memory-footprint-of-NBTTagCompound.patch → patches/server/0395-Reduce-memory-footprint-of-NBTTagCompound.patch
View File

0
patches/server/0397-Prevent-opening-inventories-when-frozen.patch → patches/server/0396-Prevent-opening-inventories-when-frozen.patch
View File

2
patches/server/0398-Optimise-ArraySetSorted-removeIf.patch → patches/server/0397-Optimise-ArraySetSorted-removeIf.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Optimise ArraySetSorted#removeIf
Remove iterator allocation and ensure the call is always O(n) Remove iterator allocation and ensure the call is always O(n)
diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
index 92bd7382f0e1e19c245587ff32dff3dd87a401a3..ea66ea9c9b64e95b52d9db41c0eafe52094eeb1e 100644 index 6228f2f67541da62b0ae093de987662db9643740..8376439e36f0f75779d0fbefbe50b215a40c42aa 100644
--- a/src/main/java/net/minecraft/server/level/DistanceManager.java --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
+++ b/src/main/java/net/minecraft/server/level/DistanceManager.java +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
@@ -86,13 +86,27 @@ public abstract class DistanceManager { @@ -86,13 +86,27 @@ public abstract class DistanceManager {

0
patches/server/0399-Don-t-run-entity-collision-code-if-not-needed.patch → patches/server/0398-Don-t-run-entity-collision-code-if-not-needed.patch
View File

2
patches/server/0400-Implement-Player-Client-Options-API.patch → patches/server/0399-Implement-Player-Client-Options-API.patch
View File

@ -97,7 +97,7 @@ index 9b3f8b6ff7a2522e74bdbc914e35d566ab9c7697..e800229c294a04581c863349119f6727
if (getMainArm() != packet.mainHand()) { if (getMainArm() != packet.mainHand()) {
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT); PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 42062d64b7ea55f5360c435ef1953452d439029b..0a9d519596b074fd88fc3594d673189ef2c5e3d9 100644 index dd77e9215c8e05e220520d5a0e2c3d1da93be054..7c406649f112e1b449d07d180c7f2d63b170f2ed 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -551,6 +551,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -551,6 +551,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
patches/server/0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch → patches/server/0400-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
View File

@ -7,7 +7,7 @@ Subject: [PATCH] Don't crash if player is attempted to be removed from
I suspect it deals with teleporting as it uses players current x/y/z I suspect it deals with teleporting as it uses players current x/y/z
diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
index ea66ea9c9b64e95b52d9db41c0eafe52094eeb1e..cca9efd1b7aabc4b8010cf4b8b942c66adb7eee1 100644 index 8376439e36f0f75779d0fbefbe50b215a40c42aa..4a9d0fca55b71f817defcb4286154c0a47bede03 100644
--- a/src/main/java/net/minecraft/server/level/DistanceManager.java --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
+++ b/src/main/java/net/minecraft/server/level/DistanceManager.java +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
@@ -300,8 +300,8 @@ public abstract class DistanceManager { @@ -300,8 +300,8 @@ public abstract class DistanceManager {

2
patches/server/0402-Broadcast-join-message-to-console.patch → patches/server/0401-Broadcast-join-message-to-console.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Broadcast join message to console
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 11698ed04d77c974f18aa6981e7f1efa60c5c7b7..f32fad01c9f1b0642615be896bbf79f73f4656db 100644 index 903a816ec6f4d1a9c82b7e32bd2b4fc9b78f3a5c..bb7260a179de2652accb79b5bd0f0e6624163ab4 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -293,7 +293,9 @@ public abstract class PlayerList { @@ -293,7 +293,9 @@ public abstract class PlayerList {

0
patches/server/0403-Fix-Chunk-Post-Processing-deadlock-risk.patch → patches/server/0402-Fix-Chunk-Post-Processing-deadlock-risk.patch
View File

2
patches/server/0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch → patches/server/0403-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
View File

@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick
delays anymore. delays anymore.
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index a603e74d6bc936db997f9230fff1100946fa8075..79403282d297c2cfd20df964f65df62ec35bb45f 100644 index 86a06c7ee3b92fbff1e21ad36b6034d892cd0c01..94a5fa9cac20597181f435998413b1981d8ef289 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1623,6 +1623,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -1623,6 +1623,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

2
patches/server/0405-Load-Chunks-for-Login-Asynchronously.patch → patches/server/0404-Load-Chunks-for-Login-Asynchronously.patch
View File

@ -37,7 +37,7 @@ index be677d437d17b74c6188ce1bd5fc6fdc228fd92f..78fbb4c3e52e900956ae0811aaf934c8
public static final TicketType<ChunkPos> UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1); public static final TicketType<ChunkPos> UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1);
public static final TicketType<Unit> PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit public static final TicketType<Unit> PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 1353b0192f54a9419b853168307727307e4cee76..782501e6663fde112700c4ca8ccba073e45dd23a 100644 index f961a0f5b571d86c8d2b57f489b421fbfb01ca3d..a041e73798e2c52026a8b9b3ff5c41bb7fa7263d 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -220,6 +220,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -220,6 +220,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

2
patches/server/0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch → patches/server/0405-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
View File

@ -7,7 +7,7 @@ The code following this has better support for null worlds to move
them back to the world spawn. them back to the world spawn.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 61fe669b567a3af5bfb6bc1c80f53b6abfde68ce..31a571ec0f4cd60b9ef192d1deb2c529e7a354ff 100644 index 03ead8423d022f91f849990b6167d86fec066361..21cbab2bd5754158ae4aa1a95f8c80b685ec166b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2017,9 +2017,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i @@ -2017,9 +2017,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i

0
patches/server/0407-Add-PlayerAttackEntityCooldownResetEvent.patch → patches/server/0406-Add-PlayerAttackEntityCooldownResetEvent.patch
View File

0
patches/server/0408-Don-t-fire-BlockFade-on-worldgen-threads.patch → patches/server/0407-Don-t-fire-BlockFade-on-worldgen-threads.patch
View File

2
patches/server/0409-Add-phantom-creative-and-insomniac-controls.patch → patches/server/0408-Add-phantom-creative-and-insomniac-controls.patch
View File

@ -33,7 +33,7 @@ index b91a61be7c4829fce0ff8da290eab580e20bb78d..22f36cd3df49160f1b6668befdd05c22
private EntitySelector() {} private EntitySelector() {}
// Paper start // Paper start
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
index e032d3e854bd60c37a5e6328389de3361108d9b2..573107f1281e68c7ba00d4dea8fac02f2d18504d 100644 index 84400bb44d5deb7c79295a83c4c3c6aac88f3175..ca9324381a60fc3072719c39918a1c16ac88799b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -558,6 +558,7 @@ public class Phantom extends FlyingMob implements Enemy { @@ -558,6 +558,7 @@ public class Phantom extends FlyingMob implements Enemy {

2
patches/server/0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch → patches/server/0409-Fix-numerous-item-duplication-issues-and-teleport-is.patch
View File

@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the
same item twice because the source was destroyed. same item twice because the source was destroyed.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 31a571ec0f4cd60b9ef192d1deb2c529e7a354ff..0dc85e33e9748a87e2dfbbbfb1861bdf636dab33 100644 index 21cbab2bd5754158ae4aa1a95f8c80b685ec166b..53c8583b8438571dd6fcec26c79a6594a4a6f786 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2167,11 +2167,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i @@ -2167,11 +2167,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i

0
patches/server/0411-Villager-Restocks-API.patch → patches/server/0410-Villager-Restocks-API.patch
View File

2
patches/server/0412-Validate-PickItem-Packet-and-kick-for-invalid.patch → patches/server/0411-Validate-PickItem-Packet-and-kick-for-invalid.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 2859db2809a3d789b8246dd76f313e304d979e0f..81a1af417ea394a63d4d86b19fadbafce8963aac 100644 index a041e73798e2c52026a8b9b3ff5c41bb7fa7263d..850ffa36da69abea61e9fd20145a9dbe3f8a5f18 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -881,7 +881,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -881,7 +881,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

0
patches/server/0413-Expose-game-version.patch → patches/server/0412-Expose-game-version.patch
View File

0
patches/server/0414-Optimize-Voxel-Shape-Merging.patch → patches/server/0413-Optimize-Voxel-Shape-Merging.patch
View File

2
patches/server/0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch → patches/server/0414-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
View File

@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
Set system properly at server startup if not set already to help protect from this. Set system properly at server startup if not set already to help protect from this.
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index a5f8554e2cd43774b1978dce659062d9c7e7dbda..55bae3efbc630be6d40d415509de4c3e744a5004 100644 index c579f586c9a2dcb6356b49f68591f61e0fa61b62..afcc80d1f79d1743b0940c69858eacec88fec889 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -28,6 +28,7 @@ public class Main { @@ -28,6 +28,7 @@ public class Main {

0
patches/server/0416-misc-debugging-dumps.patch → patches/server/0415-misc-debugging-dumps.patch
View File

4
patches/server/0375-Prevent-teleporting-dead-entities.patch → patches/server/0416-Prevent-teleporting-dead-entities.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Prevent teleporting dead entities
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index c6328204024ffffd2cd0fe1a4ee921d846143987..e9fbbe197b991276111cad87fadde8d1077a7062 100644 index 850ffa36da69abea61e9fd20145a9dbe3f8a5f18..7c7cd7e9ee014f5b822a94d394ab1978dcff7beb 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1507,6 +1507,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -1524,6 +1524,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
} }
private void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<ClientboundPlayerPositionPacket.RelativeArgument> set, boolean flag) { private void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<ClientboundPlayerPositionPacket.RelativeArgument> set, boolean flag) {