spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add further chunk update async safety check

Browse source
This commit is contained in:
md_5 2025-02-21 20:19:28 +11:00
parent d42194837f
commit e5a64e7315
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
12 changed files with 110 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From c73cf11b4d6b72dfd376c7f885e9ab75b55682f6 Mon Sep 17 00:00:00 2001
From f414e76332fd62afcd02469729bf36ae52c1b336 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations
This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0687a16185..f2b876e057 100644
index 15aadc35e..f06bbbf5e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2566,4 +2566,16 @@ public final class CraftServer implements Server {
@@ -2565,4 +2565,16 @@ public final class CraftServer implements Server {
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}
@ -27,10 +27,10 @@ index 0687a16185..f2b876e057 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 0c25788e88..b689d7d209 100644
index e734fd6e2..54c601d73 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2087,4 +2087,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2088,4 +2088,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
this.persistentDataContainer.putAll((NBTTagCompound) c);
}
}
@ -47,7 +47,7 @@ index 0c25788e88..b689d7d209 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
index f9d3b5a499..b63472322d 100644
index f9d3b5a49..b63472322 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
@@ -132,4 +132,11 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender {
@ -63,7 +63,7 @@ index f9d3b5a499..b63472322d 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
index be10d200e5..861739d4c4 100644
index be10d200e..861739d4c 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
@@ -95,4 +95,16 @@ public abstract class ServerCommandSender implements CommandSender {
@ -84,7 +84,7 @@ index be10d200e5..861739d4c4 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 1ffd115276..ff47b09dcc 100644
index 1ffd11527..ff47b09dc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -894,4 +894,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -104,7 +104,7 @@ index 1ffd115276..ff47b09dcc 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
index 3a4fb14bff..3a68e1cf5c 100644
index 3a4fb14bf..3a68e1cf5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
@@ -50,4 +50,15 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
@ -124,7 +124,7 @@ index 3a4fb14bff..3a68e1cf5c 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 92025bae9a..daf975fd03 100644
index e968385f4..8e39697f9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2342,4 +2342,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -144,7 +144,7 @@ index 92025bae9a..daf975fd03 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
index d338430fde..ed599634a1 100644
index d338430fd..ed599634a 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -246,6 +246,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta, WritableBo
@ -172,7 +172,7 @@ index d338430fde..ed599634a1 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
index 7a7c71927d..67c6bae183 100644
index 7a7c71927..67c6bae18 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
@@ -292,6 +292,7 @@ public class CraftMetaBookSigned extends CraftMetaItem implements BookMeta {
@ -200,5 +200,5 @@ index 7a7c71927d..67c6bae183 100644
+ // Spigot end
}
--
2.47.1
2.48.1

12
CraftBukkit-Patches/0003-Spigot-Configuration.patch
View file

@ -1,4 +1,4 @@
From b7d907ef0797a7a02b38835b536d45cf980148dd Mon Sep 17 00:00:00 2001
From c004fcd436d7a315a2cec88b90605565b0001cf4 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@ -51,10 +51,10 @@ index a3655f969..d3545d56d 100644
this.world = new CraftWorld((WorldServer) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5acc01fab..074bbe1c0 100644
index f06bbbf5e..8831f1d4f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -947,6 +947,7 @@ public final class CraftServer implements Server {
@@ -946,6 +946,7 @@ public final class CraftServer implements Server {
logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
}
@ -62,7 +62,7 @@ index 5acc01fab..074bbe1c0 100644
for (WorldServer world : console.getAllLevels()) {
world.serverLevelData.setDifficulty(config.difficulty);
world.setSpawnSettings(config.spawnMonsters);
@@ -961,11 +962,13 @@ public final class CraftServer implements Server {
@@ -960,11 +961,13 @@ public final class CraftServer implements Server {
}
}
}
@ -77,7 +77,7 @@ index 5acc01fab..074bbe1c0 100644
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index c2c4126b3..a4e0f8c82 100644
index f7385aac4..0a63fc9d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -134,6 +134,14 @@ public class Main {
@ -380,5 +380,5 @@ index 000000000..1cce14866
+ }
+}
--
2.47.1
2.48.1

6
CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
View file

@ -1,4 +1,4 @@
From 4f7cfe95f463ef5f8f5463a4f77d87fa7d55f67e Mon Sep 17 00:00:00 2001
From 9a02c1f39c8d334e40b9d505c5ad28e829167e7a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration
@ -31,10 +31,10 @@ index 42c72aa56..e6969c9d0 100644
} else {
merge(entityitem, itemstack1, this, itemstack);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index d6fec9ba3..920cc21ef 100644
index 407bfe64a..31619d7e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -724,6 +724,23 @@ public class CraftEventFactory {
@@ -726,6 +726,23 @@ public class CraftEventFactory {
return false;
}

20
CraftBukkit-Patches/0006-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From 97ff8b2304836754dc4178e714f3484009a01288 Mon Sep 17 00:00:00 2001
From 2e25ec5d0bdcf5e6f9d2df7863ae02067ba4b893 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -6,7 +6,7 @@ Subject: [PATCH] Async Operation Catching
Catch and throw an exception when a potentially unsafe operation occurs on a thread other than the main server thread.
diff --git a/src/main/java/net/minecraft/server/level/ChunkMapDistance.java b/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
index faff79f8f..2e44b6852 100644
index faff79f8f..ef80239bd 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
@@ -102,6 +102,7 @@ public abstract class ChunkMapDistance {
@ -17,6 +17,14 @@ index faff79f8f..2e44b6852 100644
this.naturalSpawnChunkCounter.runAllUpdates();
this.tickingTicketsTracker.runAllUpdates();
this.playerTicketManager.runAllUpdates();
@@ -468,6 +469,7 @@ public abstract class ChunkMapDistance {
@Override
protected void setLevel(long i, int j) {
+ org.spigotmc.AsyncCatcher.catchOp("chunk level update"); // Spigot
PlayerChunk playerchunk = ChunkMapDistance.this.getChunk(i);
int k = playerchunk == null ? ChunkMapDistance.a.MAX_LEVEL : playerchunk.getTicketLevel();
diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
index 4d8aa931f..5043631d1 100644
--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
@ -137,10 +145,10 @@ index d60d8b93f..102121490 100644
world.removeBlockEntity(blockposition);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 71cb0d98b..862f5d3ec 100644
index 8831f1d4f..cb8ee2a64 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -900,6 +900,7 @@ public final class CraftServer implements Server {
@@ -899,6 +899,7 @@ public final class CraftServer implements Server {
public boolean dispatchCommand(CommandSender sender, String commandLine) {
Preconditions.checkArgument(sender != null, "sender cannot be null");
Preconditions.checkArgument(commandLine != null, "commandLine cannot be null");
@ -149,7 +157,7 @@ index 71cb0d98b..862f5d3ec 100644
if (commandMap.dispatch(sender, commandLine)) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index b689d7d20..3aad490b1 100644
index 54c601d73..ad0d8e975 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -288,6 +288,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@ -213,7 +221,7 @@ index ff47b09dc..f9aba6e6d 100644
List<Entity> notchEntityList = entity.level().getEntities(entity, entity.getBoundingBox().inflate(x, y, z), Predicates.alwaysTrue());
List<org.bukkit.entity.Entity> bukkitEntityList = new java.util.ArrayList<org.bukkit.entity.Entity>(notchEntityList.size());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index daf975fd0..7e49a4edf 100644
index 8e39697f9..a289d7668 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -496,6 +496,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

38
CraftBukkit-Patches/0008-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 68f33674bf5c5c8b11e86c6b7e4352d6038c29f6 Mon Sep 17 00:00:00 2001
From ffb0b86e2b60e9d8eadc91c556dad90812dca68b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Timings
Overhauls the Timings System adding performance tracking all around the Minecraft Server
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e941d626f2..3dce991cb4 100644
index e941d626f..3dce991cb 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -205,6 +205,8 @@ import org.bukkit.craftbukkit.Main;
@ -118,7 +118,7 @@ index e941d626f2..3dce991cb4 100644
gameprofilerfiller.popPush("send chunks");
iterator = this.playerList.getPlayers().iterator();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index e6903f300e..abcf57d411 100644
index e6903f300..abcf57d41 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -65,6 +65,7 @@ import org.apache.logging.log4j.Level;
@ -146,7 +146,7 @@ index e6903f300e..abcf57d411 100644
@Override
diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
index b85513dc07..461b299a7e 100644
index b85513dc0..461b299a7 100644
--- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
@@ -156,11 +156,13 @@ public class ChunkProviderServer extends IChunkProvider {
@ -200,7 +200,7 @@ index b85513dc07..461b299a7e 100644
}
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index db9b3adbd5..1f63f833f1 100644
index db9b3adbd..1f63f833f 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -182,6 +182,7 @@ import net.minecraft.world.level.levelgen.ChunkProviderFlat;
@ -278,7 +278,7 @@ index db9b3adbd5..1f63f833f1 100644
}
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index df17fc4fbc..ca21c98a0f 100644
index 9c431c558..7e53d0a9e 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -342,6 +342,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@ -323,7 +323,7 @@ index df17fc4fbc..ca21c98a0f 100644
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 9e0608a3e2..d517caa5f9 100644
index 9e0608a3e..d517caa5f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -151,6 +151,7 @@ import org.bukkit.command.CommandSender;
@ -359,7 +359,7 @@ index 9e0608a3e2..d517caa5f9 100644
private void applyMovementEmissionAndPlaySound(Entity.MovementEmission entity_movementemission, Vec3D vec3d, BlockPosition blockposition, IBlockData iblockdata) {
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 86f232121d..50d29db117 100644
index 86f232121..50d29db11 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -163,6 +163,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -440,7 +440,7 @@ index 86f232121d..50d29db117 100644
world = this.level();
if (world instanceof WorldServer worldserver) {
diff --git a/src/main/java/net/minecraft/world/level/SpawnerCreature.java b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
index b57155085d..e166a82c42 100644
index b57155085..e166a82c4 100644
--- a/src/main/java/net/minecraft/world/level/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
@@ -150,6 +150,7 @@ public final class SpawnerCreature {
@ -460,7 +460,7 @@ index b57155085d..e166a82c42 100644
}
diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
index d3545d56dc..cd6a4fa1db 100644
index d3545d56d..cd6a4fa1d 100644
--- a/src/main/java/net/minecraft/world/level/World.java
+++ b/src/main/java/net/minecraft/world/level/World.java
@@ -96,6 +96,7 @@ import net.minecraft.world.level.dimension.WorldDimension;
@ -522,7 +522,7 @@ index d3545d56dc..cd6a4fa1db 100644
CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking entity");
CrashReportSystemDetails crashreportsystemdetails = crashreport.addCategory("Entity being ticked");
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
index f15ab390bb..8e5b4c95e9 100644
index f15ab390b..8e5b4c95e 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
@@ -32,8 +32,11 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
@ -538,7 +538,7 @@ index f15ab390bb..8e5b4c95e9 100644
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/net/minecraft/world/level/chunk/Chunk.java b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
index 857ce32b9b..ab6d2d3d4a 100644
index 857ce32b9..ab6d2d3d4 100644
--- a/src/main/java/net/minecraft/world/level/chunk/Chunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
@@ -935,6 +935,7 @@ public class Chunk extends IChunkAccess {
@ -561,7 +561,7 @@ index 857ce32b9b..ab6d2d3d4a 100644
}
}
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java b/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
index 8d7b087ee8..51be9d4f23 100644
index 8d7b087ee..51be9d4f2 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
@@ -576,12 +576,15 @@ public record SerializableChunkData(IRegistry<BiomeBase> biomeRegistry, ChunkCoo
@ -589,10 +589,10 @@ index 8d7b087ee8..51be9d4f23 100644
};
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 862f5d3ecf..16cf2f4808 100644
index cb8ee2a64..1e334691d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2575,6 +2575,11 @@ public final class CraftServer implements Server {
@@ -2574,6 +2574,11 @@ public final class CraftServer implements Server {
private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
{
@ -606,7 +606,7 @@ index 862f5d3ecf..16cf2f4808 100644
public org.bukkit.Server.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
new file mode 100644
index 0000000000..aff7b6b438
index 000000000..aff7b6b43
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
@@ -0,0 +1,160 @@
@ -771,7 +771,7 @@ index 0000000000..aff7b6b438
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 83c8e0715f..323d57e01d 100644
index 83c8e0715..323d57e01 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -411,7 +411,9 @@ public class CraftScheduler implements BukkitScheduler {
@ -785,7 +785,7 @@ index 83c8e0715f..323d57e01d 100644
task.getOwner().getLogger().log(
Level.WARNING,
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
index c885bc7443..70794669ff 100644
index c885bc744..70794669f 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -5,7 +5,10 @@ import org.bukkit.Bukkit;
@ -828,5 +828,5 @@ index c885bc7443..70794669ff 100644
+ // Spigot end
}
--
2.47.1
2.48.1

12
CraftBukkit-Patches/0016-Allow-Disabling-of-Command-TabComplete.patch
View file

@ -1,11 +1,11 @@
From c48269fcf119a96e30e401e0b3a46fa13e9ef4d1 Mon Sep 17 00:00:00 2001
From 5919b5020367418d839d506715aaad2079cc7df2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
index 1a2acacd3d..3ffa30754c 100644
index 1a2acacd3..3ffa30754 100644
--- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
@@ -438,6 +438,7 @@ public class CommandDispatcher {
@ -25,10 +25,10 @@ index 1a2acacd3d..3ffa30754c 100644
if (commandnode2.canUse(commandlistenerwrapper)) {
ArgumentBuilder argumentbuilder = commandnode2.createBuilder(); // CraftBukkit - decompile error
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 16cf2f4808..3a770e5be3 100644
index 1e334691d..49e7eccd8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2189,6 +2189,13 @@ public final class CraftServer implements Server {
@@ -2188,6 +2188,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message, WorldServer world, Vec3D pos) {
@ -43,7 +43,7 @@ index 16cf2f4808..3a770e5be3 100644
try {
if (message.startsWith("/")) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index bc9fbcc584..fc352ecf10 100644
index bc9fbcc58..fc352ecf1 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -156,4 +156,23 @@ public class SpigotConfig
@ -71,5 +71,5 @@ index bc9fbcc584..fc352ecf10 100644
+ }
}
--
2.47.1
2.48.1

8
CraftBukkit-Patches/0017-Configurable-Messages.patch
View file

@ -1,4 +1,4 @@
From 3f477693301339f73ed256668c2d0a6daf5c3aaa Mon Sep 17 00:00:00 2001
From 1a4a9745253ade9eb30524e1369de5ba4a6034d3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
@ -45,10 +45,10 @@ index d745be139..906b12166 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2ccabcb18..db46d24fd 100644
index 49e7eccd8..20e5b6e69 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -906,11 +906,11 @@ public final class CraftServer implements Server {
@@ -905,11 +905,11 @@ public final class CraftServer implements Server {
return true;
}
@ -106,5 +106,5 @@ index fc352ecf1..8ad8b2589 100644
+ }
}
--
2.47.1
2.48.1

20
CraftBukkit-Patches/0023-Watchdog-Thread.patch
View file

@ -1,11 +1,11 @@
From 214a5d55bf643ee6bb60beccfdbc376e8c5f38dd Mon Sep 17 00:00:00 2001
From 3e996a82c2a39c5ee52c815281027a5cd9eafa9f Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 5 Aug 2014 17:20:19 +0100
Subject: [PATCH] Watchdog Thread.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3dce991cb4..663ca5c1e7 100644
index 3dce991cb..663ca5c1e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1120,6 +1120,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -25,7 +25,7 @@ index 3dce991cb4..663ca5c1e7 100644
int j = this.pauseWhileEmptySeconds() * 20;
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index abcf57d411..e26a315274 100644
index abcf57d41..e26a31527 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -277,7 +277,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -38,10 +38,10 @@ index abcf57d411..e26a315274 100644
thread1.setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(DedicatedServer.LOGGER));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 433492b684..54f1416d63 100644
index 20e5b6e69..b1cbbf4d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2146,7 +2146,7 @@ public final class CraftServer implements Server {
@@ -2145,7 +2145,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@ -50,7 +50,7 @@ index 433492b684..54f1416d63 100644
}
@Override
@@ -2587,6 +2587,11 @@ public final class CraftServer implements Server {
@@ -2586,6 +2586,11 @@ public final class CraftServer implements Server {
{
return org.spigotmc.SpigotConfig.config;
}
@ -64,7 +64,7 @@ index 433492b684..54f1416d63 100644
public org.bukkit.Server.Spigot spigot()
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644
index 0000000000..f78961aa1a
index 000000000..f78961aa1
--- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +1,131 @@
@ -200,7 +200,7 @@ index 0000000000..f78961aa1a
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 8ad8b25894..130016282a 100644
index 8ad8b2589..130016282 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -200,4 +200,18 @@ public class SpigotConfig
@ -224,7 +224,7 @@ index 8ad8b25894..130016282a 100644
}
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
new file mode 100644
index 0000000000..4734d4ae83
index 000000000..4734d4ae8
--- /dev/null
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -0,0 +1,131 @@
@ -360,5 +360,5 @@ index 0000000000..4734d4ae83
+ }
+}
--
2.47.1
2.48.1

30
CraftBukkit-Patches/0024-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From 626fd40b2e02ed5450383809e5d95aca23cef256 Mon Sep 17 00:00:00 2001
From 2b9eb321fbbc65ff50fb1f9eddc1f0d34fabbc01 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 21:23:58 +1000
Subject: [PATCH] BungeeCord Support
@ -7,7 +7,7 @@ Subject: [PATCH] BungeeCord Support
* Treats Bungee as Online Mode.
diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
index 7457279ed3..35f64c5f4f 100644
index 7457279ed..35f64c5f4 100644
--- a/src/main/java/net/minecraft/network/NetworkManager.java
+++ b/src/main/java/net/minecraft/network/NetworkManager.java
@@ -96,6 +96,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -22,7 +22,7 @@ index 7457279ed3..35f64c5f4f 100644
private volatile PacketListener disconnectListener;
@Nullable
diff --git a/src/main/java/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java
index fee5547589..b8fc8ffba7 100644
index fee554758..b8fc8ffba 100644
--- a/src/main/java/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java
+++ b/src/main/java/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java
@@ -12,7 +12,8 @@ public record PacketHandshakingInSetProtocol(int protocolVersion, String hostNam
@ -36,7 +36,7 @@ index fee5547589..b8fc8ffba7 100644
private void write(PacketDataSerializer packetdataserializer) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index e26a315274..c3b3c38027 100644
index e26a31527..c3b3c3802 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -239,7 +239,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -56,7 +56,7 @@ index e26a315274..c3b3c38027 100644
}
diff --git a/src/main/java/net/minecraft/server/network/HandshakeListener.java b/src/main/java/net/minecraft/server/network/HandshakeListener.java
index 35d8c8543b..608de4f364 100644
index 35d8c8543..608de4f36 100644
--- a/src/main/java/net/minecraft/server/network/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/network/HandshakeListener.java
@@ -20,6 +20,11 @@ import java.util.HashMap;
@ -104,7 +104,7 @@ index 35d8c8543b..608de4f364 100644
}
diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
index b96ecd31b8..5c5c53ed98 100644
index b96ecd31b..5c5c53ed9 100644
--- a/src/main/java/net/minecraft/server/network/LoginListener.java
+++ b/src/main/java/net/minecraft/server/network/LoginListener.java
@@ -181,7 +181,7 @@ public class LoginListener implements PacketLoginInListener, TickablePacketListe
@ -168,7 +168,7 @@ index b96ecd31b8..5c5c53ed98 100644
HELLO, KEY, AUTHENTICATING, NEGOTIATING, VERIFYING, WAITING_FOR_COOKIES, WAITING_FOR_DUPE_DISCONNECT, PROTOCOL_SWITCHING, ACCEPTED; // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 81047633f1..c6c7c69989 100644
index 09796d0a5..9ba4087ec 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -2104,7 +2104,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@ -204,7 +204,7 @@ index 81047633f1..c6c7c69989 100644
this.waitingForSwitchToConfig = true;
this.removePlayerFromWorld();
diff --git a/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
index 3bf6d7d2d4..8e95956397 100644
index 3bf6d7d2d..8e9595639 100644
--- a/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
+++ b/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
@@ -68,7 +68,7 @@ public class NameReferencingFileConverter {
@ -217,7 +217,7 @@ index 3bf6d7d2d4..8e95956397 100644
} else {
String[] astring1 = astring;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index fd32e6c868..f5032cd9e4 100644
index fd32e6c86..f5032cd9e 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -543,7 +543,7 @@ public abstract class PlayerList {
@ -230,10 +230,10 @@ index fd32e6c868..f5032cd9e4 100644
if (this.bans.isBanned(gameprofile)) {
GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.bans.get(gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 54f1416d63..7ca23c1b8f 100644
index b1cbbf4d5..712b3c18e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -805,7 +805,13 @@ public final class CraftServer implements Server {
@@ -804,7 +804,13 @@ public final class CraftServer implements Server {
@Override
public long getConnectionThrottle() {
@ -248,7 +248,7 @@ index 54f1416d63..7ca23c1b8f 100644
}
@Override
@@ -1816,7 +1822,7 @@ public final class CraftServer implements Server {
@@ -1815,7 +1821,7 @@ public final class CraftServer implements Server {
if (result == null) {
GameProfile profile = null;
// Only fetch an online UUID in online mode
@ -258,7 +258,7 @@ index 54f1416d63..7ca23c1b8f 100644
profile = console.getProfileCache().get(name).orElse(null);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f047179df7..2d6a3a3bb6 100644
index 0241578b5..4aa76772e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2348,6 +2348,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -275,7 +275,7 @@ index f047179df7..2d6a3a3bb6 100644
public void respawn()
{
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 130016282a..1e6b13103a 100644
index 130016282..1e6b13103 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -214,4 +214,14 @@ public class SpigotConfig
@ -294,5 +294,5 @@ index 130016282a..1e6b13103a 100644
+ }
}
--
2.47.1
2.48.1

10
CraftBukkit-Patches/0038-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
View file

@ -1,14 +1,14 @@
From 12c9bd47cd7511d4b02df4339d87438e19ee4766 Mon Sep 17 00:00:00 2001
From 13188a6eb7dbd93c1587fcff0fce0332f4b8d707 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 12 Feb 2014 20:44:14 +0000
Subject: [PATCH] Allow vanilla commands to be the main version of a command
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4521ba57d..98adc6016 100644
index 712b3c18e..47c847bd9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -493,8 +493,11 @@ public final class CraftServer implements Server {
@@ -492,8 +492,11 @@ public final class CraftServer implements Server {
}
if (type == PluginLoadOrder.POSTWORLD) {
@ -21,7 +21,7 @@ index 4521ba57d..98adc6016 100644
commandMap.registerServerAliases();
DefaultPermissions.registerCorePermissions();
CraftDefaultPermissions.registerCorePermissions();
@@ -508,12 +511,21 @@ public final class CraftServer implements Server {
@@ -507,12 +510,21 @@ public final class CraftServer implements Server {
pluginManager.disablePlugins();
}
@ -78,5 +78,5 @@ index 128b826ca..f20e896f2 100644
+ }
}
--
2.47.1
2.48.1

8
CraftBukkit-Patches/0039-Implement-Silenceable-Lightning-API.patch
View file

@ -1,14 +1,14 @@
From 244eeea9534250afea45c1cb90d9d0eb72f031c0 Mon Sep 17 00:00:00 2001
From 923f36740b95a5b9910bea2c003fba58928fe7cf Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 3aad490b1..4dc493d50 100644
index ad0d8e975..0781e347f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2097,6 +2097,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2098,6 +2098,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
// Spigot start
private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
{
@ -44,5 +44,5 @@ index 3a68e1cf5..6c44dfa1c 100644
@Override
--
2.47.1
2.48.1

22
CraftBukkit-Patches/0065-BungeeCord-Chat-API.patch
View file

@ -1,11 +1,11 @@
From 9453616439207e1446b042c6a291d529371b0b7d Mon Sep 17 00:00:00 2001
From cf60fa981a2f3d0234affc8e53a00bb3b1c5b99b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
index eed54194c5..1525849692 100644
index eed54194c..152584969 100644
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
@@ -13,6 +13,12 @@ public record ClientboundSystemChatPacket(IChatBaseComponent content, boolean ov
@ -22,10 +22,10 @@ index eed54194c5..1525849692 100644
public PacketType<ClientboundSystemChatPacket> type() {
return GamePacketTypes.CLIENTBOUND_SYSTEM_CHAT;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1e281360da..9bba7acbf9 100644
index 47c847bd9..06ab74426 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -270,6 +270,8 @@ import org.yaml.snakeyaml.Yaml;
@@ -269,6 +269,8 @@ import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.error.MarkedYAMLException;
@ -34,7 +34,7 @@ index 1e281360da..9bba7acbf9 100644
public final class CraftServer implements Server {
private final String serverName = "CraftBukkit";
private final String serverVersion;
@@ -2610,6 +2612,20 @@ public final class CraftServer implements Server {
@@ -2609,6 +2611,20 @@ public final class CraftServer implements Server {
public void restart() {
org.spigotmc.RestartCommand.restart();
}
@ -56,7 +56,7 @@ index 1e281360da..9bba7acbf9 100644
public org.bukkit.Server.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
index 861739d4c4..6b36321091 100644
index 861739d4c..6b3632109 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
@@ -99,6 +99,29 @@ public abstract class ServerCommandSender implements CommandSender {
@ -90,7 +90,7 @@ index 861739d4c4..6b36321091 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index f9aba6e6d0..254cc3d5b0 100644
index f9aba6e6d..254cc3d5b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -61,6 +61,8 @@ import org.bukkit.util.BoundingBox;
@ -130,7 +130,7 @@ index f9aba6e6d0..254cc3d5b0 100644
public org.bukkit.entity.Entity.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8ab320c444..a48062b590 100644
index c6cf8f1b6..f5bcbf733 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -200,6 +200,8 @@ import org.bukkit.profile.PlayerProfile;
@ -192,7 +192,7 @@ index 8ab320c444..a48062b590 100644
public Player.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
index ed599634a1..cbe620fffe 100644
index ed599634a..cbe620fff 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -20,6 +20,14 @@ import org.bukkit.craftbukkit.util.CraftChatMessage;
@ -296,7 +296,7 @@ index ed599634a1..cbe620fffe 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
index 67c6bae183..5a791211d7 100644
index 67c6bae18..5a791211d 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
@@ -21,6 +21,12 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@ -397,5 +397,5 @@ index 67c6bae183..5a791211d7 100644
@Override
--
2.47.1
2.48.1