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

Definitely readd this patch for the first time

Browse Source
This commit is contained in:
KennyTV 2021-06-16 13:07:43 +02:00
parent 9e1255cff9
commit 2b8d06aed3
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
610 changed files with 170 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch Normal file
View File

@ -0,0 +1,45 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 16 May 2016 23:19:16 -0400
Subject: [PATCH] Avoid blocking on Network Manager creation
Per Paper issue 294
diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
index 8fffe354d40c5fac4daa03af87c2323e307bd3ea..abcd335f5577dae6d613e5e0dd2656e1ab3ee9f0 100644
--- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
+++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
@@ -61,6 +61,15 @@ public class ServerConnectionListener {
public volatile boolean running;
private final List<ChannelFuture> channels = Collections.synchronizedList(Lists.newArrayList());
final List<Connection> connections = Collections.synchronizedList(Lists.newArrayList());
+ // Paper start - prevent blocking on adding a new network manager while the server is ticking
+ private final java.util.Queue<Connection> pending = new java.util.concurrent.ConcurrentLinkedQueue<>();
+ private final void addPending() {
+ Connection manager = null;
+ while ((manager = pending.poll()) != null) {
+ connections.add(manager);
+ }
+ }
+ // Paper end
public ServerConnectionListener(MinecraftServer server) {
this.server = server;
@@ -96,7 +105,8 @@ public class ServerConnectionListener {
int j = ServerConnectionListener.this.server.getRateLimitPacketsPerSecond();
Object object = j > 0 ? new RateKickingConnection(j) : new Connection(PacketFlow.SERVERBOUND);
- ServerConnectionListener.this.connections.add((Connection) object); // CraftBukkit - decompile error
+ // ServerConnectionListener.this.connections.add((Connection) object); // CraftBukkit - decompile error
+ pending.add((Connection) object); // Paper
channel.pipeline().addLast("packet_handler", (ChannelHandler) object);
((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
}
@@ -155,6 +165,7 @@ public class ServerConnectionListener {
synchronized (this.connections) {
// Spigot Start
+ this.addPending(); // Paper
// This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order
if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
{

2
patches/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch → patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
index 95682f63c7ae1460b069e13f11295f72c1f262a8..b2bd204879badfe1cab6bea9db2d6c412505a9ce 100644 index c70b4727fe0ae9ff7b9db08a9711272994159b96..87f5f4108796aa12b454bbf39b8c1d699bac78f2 100644
--- a/src/main/java/net/minecraft/server/players/GameProfileCache.java --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
+++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
@@ -100,7 +100,7 @@ public class GameProfileCache { @@ -100,7 +100,7 @@ public class GameProfileCache {

0
patches/server/0101-Add-setting-for-proxy-online-mode-status.patch → patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
View File

0
patches/server/0102-Optimise-BlockState-s-hashCode-equals.patch → patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch
View File

2
patches/server/0103-Configurable-packet-in-spam-threshold.patch → patches/server/0104-Configurable-packet-in-spam-threshold.patch
View File

@ -23,7 +23,7 @@ index c52dc0346f93527965ef29a0ccdc4bf3debe302e..64d7c9058ee757a6d3cf3b648596092a
+ } + }
} }
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 fa6d414387950d522243370714d5425f09e351e8..b1285521d41e09fcb99c836a90b4f8b6a121ba98 100644 index 8e751e9821dc76f33e9e844990c701f69c817c4b..13077dcc0ce4e7cfa8146ee71db4c2cce9e36f4a 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
@@ -1496,13 +1496,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -1496,13 +1496,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

2
patches/server/0104-Configurable-flying-kick-messages.patch → patches/server/0105-Configurable-flying-kick-messages.patch
View File

@ -21,7 +21,7 @@ index 64d7c9058ee757a6d3cf3b648596092a810e105c..4e2f243faa209925dcb7c3ef89df3ed8
+ } + }
} }
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 37a25af3697e06a7f8aeaf462fbf50f8bc250dd3..b33ef48a4372dd8ac4a86bdd386a5a7d42583c72 100644 index 13077dcc0ce4e7cfa8146ee71db4c2cce9e36f4a..d05f284b943340fef24481adaa4da4e6d9e0169d 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
@@ -302,7 +302,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -302,7 +302,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

0
patches/server/0105-Remove-FishingHook-reference-on-Craft-Entity-removal.patch → patches/server/0106-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
View File

2
patches/server/0106-Auto-fix-bad-Y-levels-on-player-login.patch → patches/server/0107-Auto-fix-bad-Y-levels-on-player-login.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
Bring down to a saner Y level if super high, as this can cause the server to crash Bring down to a saner Y level if super high, as this can cause the server to crash
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index f48d7205242fc38c00e496c88090e0e98e394b39..c60d42c835ed9a1bcc938aa1647c5266b87a05c5 100644 index e512cd033317ce2e1437c0ac28f71db47703bc57..3c51b0c3c0cdb55852ca9d9f1609518d5905589a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -401,6 +401,7 @@ public class ServerPlayer extends Player { @@ -401,6 +401,7 @@ public class ServerPlayer extends Player {

0
patches/server/0107-Option-to-remove-corrupt-tile-entities.patch → patches/server/0108-Option-to-remove-corrupt-tile-entities.patch
View File

4
patches/server/0108-Add-EntityZapEvent.patch → patches/server/0109-Add-EntityZapEvent.patch
View File

@ -21,7 +21,7 @@ index d414b111386e18dec8992b510b93c19ece8d60dd..2c95b6eddfe46e5d2ad495bfc86ccc24
if (CraftEventFactory.callPigZapEvent(this, lightning, entitypigzombie).isCancelled()) { if (CraftEventFactory.callPigZapEvent(this, lightning, entitypigzombie).isCancelled()) {
return; return;
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index df8c953fffcc6063abd1929b8d3a07943da86e21..731aea63eedb8cb37291bb2238ff8ab2e3a5f6eb 100644 index e61abd923cc1ca469f01249563da7ff31ead7bdd..f7b3b11bd6b395d199e725bc0c0192c28cc3cd86 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -826,9 +826,17 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -826,9 +826,17 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@ -44,7 +44,7 @@ index df8c953fffcc6063abd1929b8d3a07943da86e21..731aea63eedb8cb37291bb2238ff8ab2
entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null); entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null);
entitywitch.setNoAi(this.isNoAi()); 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 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index e96ce62978e2cca454f797c4ce1ab1d306f9d7e4..68a3cc357a7f2a837d434a4defc0eeb9a2dc7c31 100644 index ae12d4a7b56ec70ac5f529e0f336019e97f667ce..8e9ae16441057fb5e42154c081f8677f4575587d 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1098,6 +1098,14 @@ public class CraftEventFactory { @@ -1098,6 +1098,14 @@ public class CraftEventFactory {

2
patches/server/0109-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch → patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
View File

@ -22,7 +22,7 @@ index 96247356d7888d5681bff60567add1188aedb18b..e83216be5a00d5b927d8c2fc364551bd
+ } + }
} }
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
index eb838fcad0593573f536d5e043cbd3f4bbe25d74..2332a00780edcf054ec63a60a42962033d0cc74a 100644 index 6c262832ba5259ec92d336114c203c254a39924c..0d476aa50170ad3623462306769020518c55cffb 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -308,6 +308,18 @@ public class FallingBlockEntity extends Entity { @@ -308,6 +308,18 @@ public class FallingBlockEntity extends Entity {

2
patches/server/0110-Cache-user-authenticator-threads.patch → patches/server/0111-Cache-user-authenticator-threads.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Cache user authenticator threads
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index 11c0da9b36aecc1a7d3acb2dccdae962426dd2e7..3e57eb2e50f94085fd23b54a54d4cf7a0b7919c7 100644 index 0df683b7503d4c34fc8af33b82a4440383702043..16c1cf342532988d3e319fb41cc4dbde09403e1a 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -117,6 +117,18 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener @@ -117,6 +117,18 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener

0
patches/server/0111-Allow-Reloading-of-Command-Aliases.patch → patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
View File

2
patches/server/0112-Add-source-to-PlayerExpChangeEvent.patch → patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
View File

@ -18,7 +18,7 @@ index ec47da6c086a6f6640ea2f41d766c900fa992459..919fbe73f46238a1846c969bf64c309f
--this.count; --this.count;
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 68a3cc357a7f2a837d434a4defc0eeb9a2dc7c31..f32a2a96da71c1cbcf0d153d882ff60ca66ffd2a 100644 index 8e9ae16441057fb5e42154c081f8677f4575587d..2f6aef39f1f9f3da09a596936f57e1cf51c9d6db 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1057,6 +1057,17 @@ public class CraftEventFactory { @@ -1057,6 +1057,17 @@ public class CraftEventFactory {

0
patches/server/0113-Don-t-let-fishinghooks-use-portals.patch → patches/server/0114-Don-t-let-fishinghooks-use-portals.patch
View File

4
patches/server/0114-Add-ProjectileCollideEvent.patch → patches/server/0115-Add-ProjectileCollideEvent.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add ProjectileCollideEvent
diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
index 676e5ad3a23bfdccd8f5f7bb9e79c3fa004dc95f..71f0de893fe0243cc226fd36685f2a3fba02575f 100644 index 97a4d3b3709028d322617efdfe9a5aabe2197d82..65faf775b786f9c237ee33c1fb0f8ab9f37d738c 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
@@ -225,6 +225,17 @@ public abstract class AbstractArrow extends Projectile { @@ -225,6 +225,17 @@ public abstract class AbstractArrow extends Projectile {
@ -87,7 +87,7 @@ index f81be1c6a5efc5090fbb8832f44dbb2ae6aa2f4a..8e81b19706a14c21b5ffdc4f12818fe7
this.checkInsideBlocks(); this.checkInsideBlocks();
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index f32a2a96da71c1cbcf0d153d882ff60ca66ffd2a..1fce91a05a6b04a8d93d2707637c5b96c318a641 100644 index 2f6aef39f1f9f3da09a596936f57e1cf51c9d6db..deb331a95d1c8e53c21e2ab68f205c2427cdbef4 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1201,6 +1201,16 @@ public class CraftEventFactory { @@ -1201,6 +1201,16 @@ public class CraftEventFactory {

0
patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch → patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
View File

0
patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch → patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
View File

0
patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch → patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
View File

0
patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch → patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
View File

2
patches/server/0119-Optimize-ItemStack.isEmpty.patch → patches/server/0120-Optimize-ItemStack.isEmpty.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
Remove hashMap lookup every check, simplify code to remove ternary Remove hashMap lookup every check, simplify code to remove ternary
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index d3267cdef523b62f9985e49b768e6ad22fbe874d..4d4b471bbfb2d9174391c8adc6075ec11295408b 100644 index bbaf615a150bc9c1ad61d509209350eec922a9f2..55e2ac3fc3d6e1da40f766ac42c9ca24b8b6e872 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java --- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -241,7 +241,7 @@ public final class ItemStack { @@ -241,7 +241,7 @@ public final class ItemStack {

2
patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch → patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
index fd2d0eaa190068646250956c4d5e5e9aeee7b1e4..ef382aaeb86ca41356a076ff4adfe5fb652b43c5 100644 index bca3388c51917bd7b690c42e63c20f98d38c5baf..de2ec66790b3e86b9e8feff56b28697695b0ab2c 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
@@ -92,6 +92,7 @@ public class ArmorStand extends LivingEntity { @@ -92,6 +92,7 @@ public class ArmorStand extends LivingEntity {

0
patches/server/0121-String-based-Action-Bar-API.patch → patches/server/0122-String-based-Action-Bar-API.patch
View File

4
patches/server/0122-Properly-fix-item-duplication-bug.patch → patches/server/0123-Properly-fix-item-duplication-bug.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
Credit to prplz for figuring out the real issue Credit to prplz for figuring out the real issue
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4ea1e8b1442c9dc9d282b8cb51c2e588fe4b19a7..ce77dc9e046be1e22d2a6d485d8f17a5fd11949e 100644 index 3c51b0c3c0cdb55852ca9d9f1609518d5905589a..a580ac8a39612f7b2cc9aad2815e987d4ba77b42 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2117,7 +2117,7 @@ public class ServerPlayer extends Player { @@ -2117,7 +2117,7 @@ public class ServerPlayer extends Player {
@ -19,7 +19,7 @@ index 4ea1e8b1442c9dc9d282b8cb51c2e588fe4b19a7..ce77dc9e046be1e22d2a6d485d8f17a5
@Override @Override
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 35aa8b40a26a5941d07421f96b424b975a32224e..55cd070c2dbf4cf4d8d0fc62067e9bde69ac7e84 100644 index d05f284b943340fef24481adaa4da4e6d9e0169d..a6891c43b674919eecaac5e826b4d979478b300c 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
@@ -2822,7 +2822,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -2822,7 +2822,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

0
patches/server/0123-Firework-API-s.patch → patches/server/0124-Firework-API-s.patch
View File

2
patches/server/0124-PlayerTeleportEndGatewayEvent.patch → patches/server/0125-PlayerTeleportEndGatewayEvent.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
Allows you to access the Gateway being used in a teleport event Allows you to access the Gateway being used in a teleport event
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
index cf57c89db3082edf22bad89a3e2f1974f682aaa6..2bf65c8da827c6bdbfb74a9d8ee5754584c40c53 100644 index fe33ed6fde98de61a9db594e8752b978b16db3e4..07c786b3988a2cc3a7bd3910dd909b887395a194 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
@@ -11,6 +11,7 @@ import net.minecraft.data.worldgen.Features; @@ -11,6 +11,7 @@ import net.minecraft.data.worldgen.Features;

0
patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch → patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
View File

0
patches/server/0126-Enforce-Sync-Player-Saves.patch → patches/server/0127-Enforce-Sync-Player-Saves.patch
View File

2
patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch → patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572
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 a015bee73ae4d0aebeb12beb50f6f6d9b1758805..739fee2b1f9df1dd13f7a0f9acb27fc5d40c16a5 100644 index 3cc6b1afe465ca57df2f22d4d735a95439174e30..7f080d8aac9198dd935a8af090ee82f618551203 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
@@ -2240,6 +2240,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -2240,6 +2240,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

8
patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch → patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
View File

@ -129,7 +129,7 @@ index 919fbe73f46238a1846c969bf64c309f3b9ad9d6..9662104a85faff2cdafd8cf001a82221
@Override @Override
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 041a61e037e7f6fddd94567f2954be600c737811..971e4c6d742e0c63b3c5dfa6d87b2468f8ce5010 100644 index 2654ff0b458df689d1d27f9e4d3e3b56dc1296da..70804eb057cc7d6605e045baf6b9ffdb8cb2d477 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1699,7 +1699,8 @@ public abstract class LivingEntity extends Entity { @@ -1699,7 +1699,8 @@ public abstract class LivingEntity extends Entity {
@ -169,7 +169,7 @@ index 0fd1dfacca88cd5399e05cb7ebc0150491e8f59c..c1cdb1905536bda76f34ad3fc7969964
// CraftBukkit end // CraftBukkit end
} }
diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
index 593442f0f2d58e2e0a0a86d6f16aea90cc36d184..b782d278463a72b8514719e9b14986f268828772 100644 index bae8340abda9f400450c835946b30aacec261f6d..fa551b1338a21b7b0864bdb9f31cb365c918facf 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
@@ -455,7 +455,7 @@ public class Turtle extends Animal { @@ -455,7 +455,7 @@ public class Turtle extends Animal {
@ -182,7 +182,7 @@ index 593442f0f2d58e2e0a0a86d6f16aea90cc36d184..b782d278463a72b8514719e9b14986f2
} }
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index 9d6d8bf5f38ec11f26665ae676c46e4ef089670b..e286d4ed03eba05b862741cb98db8a031224cd98 100644 index 9d5b78880ea9d7efb8a6c5ffa26122e08b45f494..401a105a161c23a8d3fe45d0a7c845072afb8bd9 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -634,7 +634,7 @@ public class EnderDragon extends Mob implements Enemy { @@ -634,7 +634,7 @@ public class EnderDragon extends Mob implements Enemy {
@ -204,7 +204,7 @@ index 9d6d8bf5f38ec11f26665ae676c46e4ef089670b..e286d4ed03eba05b862741cb98db8a03
if (this.dragonFight != null) { if (this.dragonFight != null) {
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 731aea63eedb8cb37291bb2238ff8ab2e3a5f6eb..6a9e2105b2d9a4ee83c0a2516d5ef26dc3b99053 100644 index f7b3b11bd6b395d199e725bc0c0192c28cc3cd86..98085ea2b5baf99697f2992354918e15691c888f 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -616,7 +616,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -616,7 +616,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler

2
patches/server/0129-Cap-Entity-Collisions.patch → patches/server/0130-Cap-Entity-Collisions.patch
View File

@ -27,7 +27,7 @@ index 2dc58b9f769ea43b737804456aafab47ecc143b8..c611b5a63498f5ad1f50a75ccd5d7299
+ } + }
} }
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 739fee2b1f9df1dd13f7a0f9acb27fc5d40c16a5..23342cd50e4722dd80c0d32057b6473f68963652 100644 index 7f080d8aac9198dd935a8af090ee82f618551203..927cc59705c662d319fbee47c8da00d8e6256e72 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
@@ -321,6 +321,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -321,6 +321,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

0
patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch → patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
View File

2
patches/server/0131-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch → patches/server/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
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 da97afe93a98daac33f143c6da0b42f71db25dba..5a80ea6bee72921454fbbd6ee202dc114c481ea1 100644 index b20c1a772abdbadb72f141a751e954b126ab3de9..f4f0982aa11da0b5bf88a42c02e86f652f8ea615 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
@@ -185,7 +185,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -185,7 +185,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

2
patches/server/0132-Do-not-let-armorstands-drown.patch → patches/server/0133-Do-not-let-armorstands-drown.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Do not let armorstands drown
diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
index ef382aaeb86ca41356a076ff4adfe5fb652b43c5..cda073a8ab9daed75f284cbbe4459991fba348f0 100644 index de2ec66790b3e86b9e8feff56b28697695b0ab2c..6d717d3852afb3a3a4bef30c68980c402bdfefff 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
@@ -936,5 +936,12 @@ public class ArmorStand extends LivingEntity { @@ -936,5 +936,12 @@ public class ArmorStand extends LivingEntity {

0
patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch → patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch
View File

0
patches/server/0134-Add-system-property-to-disable-book-size-limits.patch → patches/server/0135-Add-system-property-to-disable-book-size-limits.patch
View File

0
patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch → patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
View File

0
patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch → patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch
View File

0
patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch → patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch
View File

0
patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch → patches/server/0139-provide-a-configurable-option-to-disable-creeper-lin.patch
View File

2
patches/server/0139-Item-canEntityPickup.patch → patches/server/0140-Item-canEntityPickup.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index b13774873f795b149c15fddb8053d9419f1841ca..2ed756c73b0cfddb559126d85316f37c3f958c0c 100644 index ac0f2d98a8b2f515696a6e3959b8ff4ff05ba19b..61c9b89b6ef41cde465d84f75f2dc6ef07048cc4 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java --- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -614,6 +614,11 @@ public abstract class Mob extends LivingEntity { @@ -614,6 +614,11 @@ public abstract class Mob extends LivingEntity {

0
patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch → patches/server/0141-PlayerPickupItemEvent-setFlyAtPlayer.patch
View File

0
patches/server/0141-PlayerAttemptPickupItemEvent.patch → patches/server/0142-PlayerAttemptPickupItemEvent.patch
View File

2
patches/server/0142-Add-UnknownCommandEvent.patch → patches/server/0143-Add-UnknownCommandEvent.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index dcc1a3856560ab0eb4de45a358e189134adeac17..55444b51e416857a3854a0f1a41f24390f744119 100644 index 79fe58b09c9e0870a5ab55bc21b8ab933450a1d7..2f25e4c26f2f418de738ba2fcf7f2485bb2dda3c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -792,7 +792,13 @@ public final class CraftServer implements Server { @@ -792,7 +792,13 @@ public final class CraftServer implements Server {

0
patches/server/0143-Basic-PlayerProfile-API.patch → patches/server/0144-Basic-PlayerProfile-API.patch
View File

2
patches/server/0144-Shoulder-Entities-Release-API.patch → patches/server/0145-Shoulder-Entities-Release-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 73277b04a45444edce02cce3e033741ebaf2ad0c..075bbc75d2e33be3a42c6c3ec279eeeba6408333 100644 index 56ce24ab7213776285d09cc0ab91f012d3e58caf..64f916d290df16ecab9ccb8fa029839360b4f4c6 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java --- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1953,20 +1953,44 @@ public abstract class Player extends LivingEntity { @@ -1953,20 +1953,44 @@ public abstract class Player extends LivingEntity {

0
patches/server/0145-Profile-Lookup-Events.patch → patches/server/0146-Profile-Lookup-Events.patch
View File

2
patches/server/0146-Block-player-logins-during-server-shutdown.patch → patches/server/0147-Block-player-logins-during-server-shutdown.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Block player logins during server shutdown
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index 3e57eb2e50f94085fd23b54a54d4cf7a0b7919c7..29555323bcc7d7faa3af6ed4507a1646714ab84a 100644 index 16c1cf342532988d3e319fb41cc4dbde09403e1a..da563f3dd075d4d0000f13e6b5a88e2b4a9bc871 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -69,6 +69,12 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener @@ -69,6 +69,12 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener

2
patches/server/0147-Entity-fromMobSpawner.patch → patches/server/0148-Entity-fromMobSpawner.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
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 23342cd50e4722dd80c0d32057b6473f68963652..01b3dca8b90d38c5fbe23e72769f54bd87144772 100644 index 927cc59705c662d319fbee47c8da00d8e6256e72..609bffc7d8f21c8733b3fb861fe02f9d1302d796 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
@@ -321,6 +321,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -321,6 +321,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

0
patches/server/0148-Improve-the-Saddle-API-for-Horses.patch → patches/server/0149-Improve-the-Saddle-API-for-Horses.patch
View File

0
patches/server/0149-Implement-ensureServerConversions-API.patch → patches/server/0150-Implement-ensureServerConversions-API.patch
View File

0
patches/server/0150-Implement-getI18NDisplayName.patch → patches/server/0151-Implement-getI18NDisplayName.patch
View File

0
patches/server/0151-ProfileWhitelistVerifyEvent.patch → patches/server/0152-ProfileWhitelistVerifyEvent.patch
View File

0
patches/server/0152-Fix-this-stupid-bullshit.patch → patches/server/0153-Fix-this-stupid-bullshit.patch
View File

0
patches/server/0153-LivingEntity-setKiller.patch → patches/server/0154-LivingEntity-setKiller.patch
View File

0
patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch → patches/server/0155-Ocelot-despawns-should-honor-nametags-and-leash.patch
View File

0
patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch → patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
View File

2
patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch → patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch
View File

@ -27,7 +27,7 @@ index 48319aaf1c525c6fb7bdee5c2f570a0d056d4eae..52954fc3bf932cfc9d5ce63e3d3cace3
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index 29555323bcc7d7faa3af6ed4507a1646714ab84a..700ab378f43b3841c82b7aadc1c3818dc0621a58 100644 index da563f3dd075d4d0000f13e6b5a88e2b4a9bc871..cc7a4f8a4b351011dfd131b30c4b9386fde84e95 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -297,6 +297,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener @@ -297,6 +297,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener

0
patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch → patches/server/0158-Handle-plugin-prefixes-using-Log4J-configuration.patch
View File

0
patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch → patches/server/0159-Improve-Log4J-Configuration-Plugin-Loggers.patch
View File

2
patches/server/0159-Add-PlayerJumpEvent.patch → patches/server/0160-Add-PlayerJumpEvent.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
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 03dcaffb57436875baf1b1f85133f422f5b7bbe0..4a731fd42d92822ec3ca0091e108979047c8bc8b 100644 index bb58cf52e69258a8c59b595f5fa28ced562965f3..24f6aeb862c9384ec11132cdf14ca73ee0762e2e 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
@@ -1187,7 +1187,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -1187,7 +1187,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

2
patches/server/0160-handle-PacketPlayInKeepAlive-async.patch → patches/server/0161-handle-PacketPlayInKeepAlive-async.patch
View File

@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
random disconnections for clients. random disconnections for clients.
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 049436f5cc373f6d076a62ae2b548b0154a43b78..6049c63b4f7abde0840738638d4bf19172a01200 100644 index 24f6aeb862c9384ec11132cdf14ca73ee0762e2e..f188a55fda95abd5ccf9119ed4ab772841128d74 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
@@ -2781,14 +2781,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -2781,14 +2781,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

2
patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch → patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch
View File

@ -90,7 +90,7 @@ index c4ba069f5124ec151e05813beddf293fddc3b804..484221e5a9c246aa91e0eacef3911b0e
@Override @Override
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 4f21d578a65778ab9022b09bee3b84af341ddbdd..1af5e3f3389d5f4e391f05b3f8e7df9d3c799981 100644 index ea7a937dfd0769d734a056709d3af9d2f2ee5332..7badc90ec9e3b2dfffac6601e432c41224b701f6 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
@@ -192,6 +192,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -192,6 +192,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
patches/server/0162-revert-serverside-behavior-of-keepalives.patch → patches/server/0163-revert-serverside-behavior-of-keepalives.patch
View File

@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
at the cost of dead connections being kept open for longer. at the cost of dead connections being kept open for longer.
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 6049c63b4f7abde0840738638d4bf19172a01200..b2bbd25e5572f59add71579b676d5a4c719be239 100644 index f188a55fda95abd5ccf9119ed4ab772841128d74..c2f614b64482be75b28d47e79b0531a9143a157d 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
@@ -222,9 +222,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -222,9 +222,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

2
patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch → patches/server/0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 075bbc75d2e33be3a42c6c3ec279eeeba6408333..d3fe3eabf4465101760951113b23edf2ce03e57d 100644 index 64f916d290df16ecab9ccb8fa029839360b4f4c6..eb71f050fcd673ee4d9d1da62e098e2e37d4dd9a 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java --- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -30,6 +30,7 @@ import net.minecraft.network.chat.MutableComponent; @@ -30,6 +30,7 @@ import net.minecraft.network.chat.MutableComponent;

2
patches/server/0164-Add-PlayerArmorChangeEvent.patch → patches/server/0165-Add-PlayerArmorChangeEvent.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 89913edf98d65f08f379d0d201f9963c23573478..28de49c8b5771491b168bba26e6033669c48e3c9 100644 index 8044082ed3ca6076af38e4299e50f1f690d02a72..0dc03f53c80aac91a914bea91958a6c11c4f2061 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@

2
patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch → patches/server/0166-Prevent-logins-from-being-processed-when-the-player-.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index 700ab378f43b3841c82b7aadc1c3818dc0621a58..7923078a4235a6169eb94b7c0ce85e4cd51eb593 100644 index cc7a4f8a4b351011dfd131b30c4b9386fde84e95..7224aa974a3936a68d1c1210c671192812af93c9 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -76,7 +76,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener @@ -76,7 +76,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener

0
patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch → patches/server/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
View File

0
patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch → patches/server/0168-use-CB-BlockState-implementations-for-captured-block.patch
View File

0
patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch → patches/server/0169-API-to-get-a-BlockState-without-a-snapshot.patch
View File

0
patches/server/0169-AsyncTabCompleteEvent.patch → patches/server/0170-AsyncTabCompleteEvent.patch
View File

0
patches/server/0170-PlayerPickupExperienceEvent.patch → patches/server/0171-PlayerPickupExperienceEvent.patch
View File

0
patches/server/0171-Ability-to-apply-mending-to-XP-API.patch → patches/server/0172-Ability-to-apply-mending-to-XP-API.patch
View File

0
patches/server/0172-Make-max-squid-spawn-height-configurable.patch → patches/server/0173-Make-max-squid-spawn-height-configurable.patch
View File

2
patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch → patches/server/0174-PlayerNaturallySpawnCreaturesEvent.patch
View File

@ -9,7 +9,7 @@ from triggering monster spawns on a server.
Also a highly more effecient way to blanket block spawns in a world Also a highly more effecient way to blanket block spawns in a world
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 b489307e64cab8c990cba775c299297ed8ccf05c..47167bbd2f167e9e266b0962a2034379ab8b7e77 100644 index f4f0982aa11da0b5bf88a42c02e86f652f8ea615..dd9cae17aa9ec02e25642a1a45409bec7fb1da91 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
@@ -974,11 +974,21 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -974,11 +974,21 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

0
patches/server/0174-PreCreatureSpawnEvent.patch → patches/server/0175-PreCreatureSpawnEvent.patch
View File

0
patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch → patches/server/0176-Add-setPlayerProfile-API-for-Skulls.patch
View File

0
patches/server/0176-Fill-Profile-Property-Events.patch → patches/server/0177-Fill-Profile-Property-Events.patch
View File

0
patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch → patches/server/0178-PlayerAdvancementCriterionGrantEvent.patch
View File

0
patches/server/0178-Add-ArmorStand-Item-Meta.patch → patches/server/0179-Add-ArmorStand-Item-Meta.patch
View File

0
patches/server/0179-Extend-Player-Interact-cancellation.patch → patches/server/0180-Extend-Player-Interact-cancellation.patch
View File

0
patches/server/0180-Tameable-getOwnerUniqueId-API.patch → patches/server/0181-Tameable-getOwnerUniqueId-API.patch
View File

0
patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch → patches/server/0182-Toggleable-player-crits-helps-mitigate-hacked-client.patch
View File

0
patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch → patches/server/0183-Disable-Explicit-Network-Manager-Flushing.patch
View File

0
patches/server/0183-Implement-extended-PaperServerListPingEvent.patch → patches/server/0184-Implement-extended-PaperServerListPingEvent.patch
View File

0
patches/server/0184-Improved-Async-Task-Scheduler.patch → patches/server/0185-Improved-Async-Task-Scheduler.patch
View File

0
patches/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch → patches/server/0186-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
View File

0
patches/server/0186-Player.setPlayerProfile-API.patch → patches/server/0187-Player.setPlayerProfile-API.patch
View File

0
patches/server/0187-getPlayerUniqueId-API.patch → patches/server/0188-getPlayerUniqueId-API.patch
View File

0
patches/server/0188-Make-player-data-saving-configurable.patch → patches/server/0189-Make-player-data-saving-configurable.patch
View File

0
patches/server/0189-Make-legacy-ping-handler-more-reliable.patch → patches/server/0190-Make-legacy-ping-handler-more-reliable.patch
View File

0
patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch → patches/server/0191-Call-PaperServerListPingEvent-for-legacy-pings.patch
View File

0
patches/server/0191-Flag-to-disable-the-channel-limit.patch → patches/server/0192-Flag-to-disable-the-channel-limit.patch
View File

0
patches/server/0192-Add-method-to-open-already-placed-sign.patch → patches/server/0193-Add-method-to-open-already-placed-sign.patch
View File

0
patches/server/0193-Configurable-sprint-interruption-on-attack.patch → patches/server/0194-Configurable-sprint-interruption-on-attack.patch
View File

0
patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch → patches/server/0195-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
View File

0
patches/server/0195-EndermanEscapeEvent.patch → patches/server/0196-EndermanEscapeEvent.patch
View File

0
patches/server/0196-Enderman.teleportRandomly.patch → patches/server/0197-Enderman.teleportRandomly.patch
View File

0
patches/server/0197-Block-Enderpearl-Travel-Exploit.patch → patches/server/0198-Block-Enderpearl-Travel-Exploit.patch
View File

2
patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch → patches/server/0199-Expand-World.spawnParticle-API-and-add-Builder.patch
View File

@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
This adds a new Builder API which is much friendlier to use. This adds a new Builder API which is much friendlier to use.
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 097406c4c2ba72060efb4efd06fb1cbbb6bc4ad5..3634a9d2f76bc7cd4479026f7507fc6658a41a84 100644 index 33b156a02b1b051b0cafb55af2804b1f3f4b4434..c29092954b0ea79184972d266d22570b343a9d70 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1287,12 +1287,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -1287,12 +1287,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl

Some files were not shown because too many files have changed in this diff Show More