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

Rebuild patches

Browse source
This commit is contained in:
md_5 2025-04-13 10:28:23 +10:00
parent e339edc403
commit 3dafb730f3
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
9 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 3a5bd4799b74080866ccb39043d16852c1a48b6f Mon Sep 17 00:00:00 2001 From 7664d6101dfc8d9f79e8332a711bdcb642aed707 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 2 Jun 2013 15:10:56 +1000 Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations Subject: [PATCH] Skeleton API Implementations
@ -27,10 +27,10 @@ index 01de36d0b..3e1903310 100644
+ // Spigot end + // Spigot end
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 285acb1c5..65fd6faee 100644 index f21946418..b8f783209 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2086,4 +2086,15 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -2079,4 +2079,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
this.persistentDataContainer.putAll((NBTTagCompound) c); this.persistentDataContainer.putAll((NBTTagCompound) c);
} }
} }
@ -124,7 +124,7 @@ index 3a4fb14bf..3a68e1cf5 100644
+ // Spigot end + // Spigot end
} }
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 ebd52ca0e..33dd4e643 100644 index 5af8802e3..a1f7c91e3 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
@@ -2347,4 +2347,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -2347,4 +2347,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@ -1,4 +1,4 @@
From eadf6c9c05354f7d26e97aac386e34ae48eeb781 Mon Sep 17 00:00:00 2001 From 7debde8cd014665aded14729352101e62fcf5fc9 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100 Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching Subject: [PATCH] Async Operation Catching
@ -62,10 +62,10 @@ index d4bf5c5d8..7eea04eb5 100644
Vec3D vec3d = entityplayer.position().subtract(this.entity.position()); Vec3D vec3d = entityplayer.position().subtract(this.entity.position());
int i = PlayerChunkMap.this.getPlayerViewDistance(entityplayer); int i = PlayerChunkMap.this.getPlayerViewDistance(entityplayer);
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 85e76f2b9..a0b7a557d 100644 index bafca6b82..f39ee0546 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java --- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -1068,6 +1068,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -1070,6 +1070,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
// CraftBukkit start // CraftBukkit start
private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) { private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
@ -73,7 +73,7 @@ index 85e76f2b9..a0b7a557d 100644
if (entity.isRemoved()) { if (entity.isRemoved()) {
// WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
return false; return false;
@@ -1822,6 +1823,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -1828,6 +1829,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
@Override @Override
public LevelEntityGetter<Entity> getEntities() { public LevelEntityGetter<Entity> getEntities() {
@ -81,7 +81,7 @@ index 85e76f2b9..a0b7a557d 100644
return this.entityManager.getEntityGetter(); return this.entityManager.getEntityGetter();
} }
@@ -1949,6 +1951,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -1955,6 +1957,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
} }
public void onTrackingStart(Entity entity) { public void onTrackingStart(Entity entity) {
@ -89,7 +89,7 @@ index 85e76f2b9..a0b7a557d 100644
WorldServer.this.getChunkSource().addEntity(entity); WorldServer.this.getChunkSource().addEntity(entity);
if (entity instanceof EntityPlayer entityplayer) { if (entity instanceof EntityPlayer entityplayer) {
WorldServer.this.players.add(entityplayer); WorldServer.this.players.add(entityplayer);
@@ -1977,6 +1980,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -1983,6 +1986,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
} }
public void onTrackingEnd(Entity entity) { public void onTrackingEnd(Entity entity) {
@ -98,7 +98,7 @@ index 85e76f2b9..a0b7a557d 100644
if (entity instanceof EntityPlayer entityplayer) { if (entity instanceof EntityPlayer entityplayer) {
WorldServer.this.players.remove(entityplayer); WorldServer.this.players.remove(entityplayer);
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 3be8087c1..1fb92b185 100644 index 947f5be3d..d2d6de827 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -1164,6 +1164,7 @@ public abstract class EntityLiving extends Entity implements Attackable { @@ -1164,6 +1164,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@ -149,10 +149,10 @@ index e6e8076e1..d002ad986 100644
if (commandMap.dispatch(sender, commandLine)) { if (commandMap.dispatch(sender, commandLine)) {
return true; return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 65fd6faee..a8cabe99f 100644 index b8f783209..33172774d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -286,6 +286,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -279,6 +279,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override @Override
public boolean unloadChunkRequest(int x, int z) { public boolean unloadChunkRequest(int x, int z) {
@ -160,7 +160,7 @@ index 65fd6faee..a8cabe99f 100644
if (isChunkLoaded(x, z)) { if (isChunkLoaded(x, z)) {
world.getChunkSource().removeTicketWithRadius(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 1); world.getChunkSource().removeTicketWithRadius(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 1);
} }
@@ -294,6 +295,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -287,6 +288,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
} }
private boolean unloadChunk0(int x, int z, boolean save) { private boolean unloadChunk0(int x, int z, boolean save) {
@ -168,7 +168,7 @@ index 65fd6faee..a8cabe99f 100644
if (!isChunkLoaded(x, z)) { if (!isChunkLoaded(x, z)) {
return true; return true;
} }
@@ -310,6 +312,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -303,6 +305,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override @Override
public boolean regenerateChunk(int x, int z) { public boolean regenerateChunk(int x, int z) {
@ -176,7 +176,7 @@ index 65fd6faee..a8cabe99f 100644
throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)"); throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)");
/* /*
if (!unloadChunk0(x, z, false)) { if (!unloadChunk0(x, z, false)) {
@@ -387,6 +390,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -380,6 +383,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override @Override
public boolean loadChunk(int x, int z, boolean generate) { public boolean loadChunk(int x, int z, boolean generate) {
@ -184,7 +184,7 @@ index 65fd6faee..a8cabe99f 100644
IChunkAccess chunk = world.getChunkSource().getChunk(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); IChunkAccess chunk = world.getChunkSource().getChunk(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
// If generate = false, but the chunk already exists, we will get this back. // If generate = false, but the chunk already exists, we will get this back.
@@ -922,6 +926,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -915,6 +919,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override @Override
public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<? super Entity> filter) { public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<? super Entity> filter) {
@ -192,7 +192,7 @@ index 65fd6faee..a8cabe99f 100644
Preconditions.checkArgument(boundingBox != null, "BoundingBox cannot be null"); Preconditions.checkArgument(boundingBox != null, "BoundingBox cannot be null");
AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ()); AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
@@ -1076,6 +1081,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -1069,6 +1074,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override @Override
public void save() { public void save() {
@ -213,7 +213,7 @@ index 19ed72385..a36d8cdb8 100644
List<Entity> notchEntityList = entity.level().getEntities(entity, entity.getBoundingBox().inflate(x, y, z), Predicates.alwaysTrue()); 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()); 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 33dd4e643..a61b8e4d0 100644 index a1f7c91e3..7b68caebd 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
@@ -496,6 +496,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -496,6 +496,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

6
CraftBukkit-Patches/0007-View-Distance.patch
View file

@ -1,4 +1,4 @@
From a54244ddb1e819c362f786d2250170322ce9fa13 Mon Sep 17 00:00:00 2001 From a36b50b107d24f79fb19845cbaa050dd5c79dc82 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sat, 23 Mar 2013 09:52:41 +1100 Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance Subject: [PATCH] View Distance
@ -6,10 +6,10 @@ Subject: [PATCH] View Distance
This commit allows the user to select per world view distances. This commit allows the user to select per world view distances.
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index a0b7a557d..ea18536f5 100644 index f39ee0546..229e7ef9b 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java --- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -274,8 +274,8 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -276,8 +276,8 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
this.entityManager = new PersistentEntitySectionManager<Entity>(Entity.class, new WorldServer.a(), entitypersistentstorage); this.entityManager = new PersistentEntitySectionManager<Entity>(Entity.class, new WorldServer.a(), entitypersistentstorage);
StructureTemplateManager structuretemplatemanager = minecraftserver.getStructureManager(); StructureTemplateManager structuretemplatemanager = minecraftserver.getStructureManager();

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

@ -1,4 +1,4 @@
From dbd0fd7b7f7255443cae28b0ed64f95f5a8af76c Mon Sep 17 00:00:00 2001 From e4230a5fcdcdf8ef356934e620e5482200699b2f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500 Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings Subject: [PATCH] Spigot Timings
@ -199,7 +199,7 @@ index 03f9d3c7a..4fdf130de 100644
gameprofilerfiller.pop(); gameprofilerfiller.pop();
gameprofilerfiller.popPush("customSpawners"); gameprofilerfiller.popPush("customSpawners");
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index ea18536f5..7e8a46715 100644 index 229e7ef9b..34c4d8464 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java --- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -178,6 +178,7 @@ import net.minecraft.world.level.levelgen.ChunkProviderFlat; @@ -178,6 +178,7 @@ import net.minecraft.world.level.levelgen.ChunkProviderFlat;
@ -209,8 +209,8 @@ index ea18536f5..7e8a46715 100644
+import org.bukkit.craftbukkit.SpigotTimings; // Spigot +import org.bukkit.craftbukkit.SpigotTimings; // Spigot
import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.craftbukkit.generator.CustomWorldChunkManager; import org.bukkit.craftbukkit.generator.CustomWorldChunkManager;
import org.bukkit.craftbukkit.util.WorldUUID; import org.bukkit.craftbukkit.util.CraftLocation;
@@ -379,6 +380,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -381,6 +382,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
} }
gameprofilerfiller.push("tickPending"); gameprofilerfiller.push("tickPending");
@ -218,7 +218,7 @@ index ea18536f5..7e8a46715 100644
if (!this.isDebug() && flag) { if (!this.isDebug() && flag) {
long k = this.getGameTime(); long k = this.getGameTime();
@@ -388,6 +390,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -390,6 +392,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
this.fluidTicks.tick(k, 65536, this::tickFluid); this.fluidTicks.tick(k, 65536, this::tickFluid);
gameprofilerfiller.pop(); gameprofilerfiller.pop();
} }
@ -226,7 +226,7 @@ index ea18536f5..7e8a46715 100644
gameprofilerfiller.popPush("raid"); gameprofilerfiller.popPush("raid");
if (flag) { if (flag) {
@@ -398,7 +401,9 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -400,7 +403,9 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
this.getChunkSource().tick(booleansupplier, true); this.getChunkSource().tick(booleansupplier, true);
gameprofilerfiller.popPush("blockEvents"); gameprofilerfiller.popPush("blockEvents");
if (flag) { if (flag) {
@ -236,7 +236,7 @@ index ea18536f5..7e8a46715 100644
} }
this.handlingTick = false; this.handlingTick = false;
@@ -411,12 +416,14 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -413,12 +418,14 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
if (flag1 || this.emptyTime++ < 300) { if (flag1 || this.emptyTime++ < 300) {
gameprofilerfiller.push("entities"); gameprofilerfiller.push("entities");
@ -251,7 +251,7 @@ index ea18536f5..7e8a46715 100644
this.entityTickList.forEach((entity) -> { this.entityTickList.forEach((entity) -> {
if (!entity.isRemoved()) { if (!entity.isRemoved()) {
if (!tickratemanager.isEntityFrozen(entity)) { if (!tickratemanager.isEntityFrozen(entity)) {
@@ -441,6 +448,8 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -443,6 +450,8 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
} }
} }
}); });
@ -260,7 +260,7 @@ index ea18536f5..7e8a46715 100644
gameprofilerfiller.pop(); gameprofilerfiller.pop();
this.tickBlockEntities(); this.tickBlockEntities();
} }
@@ -847,6 +856,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -849,6 +858,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
} }
public void tickNonPassenger(Entity entity) { public void tickNonPassenger(Entity entity) {
@ -268,7 +268,7 @@ index ea18536f5..7e8a46715 100644
entity.setOldPosAndRot(); entity.setOldPosAndRot();
GameProfilerFiller gameprofilerfiller = Profiler.get(); GameProfilerFiller gameprofilerfiller = Profiler.get();
@@ -862,6 +872,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -864,6 +874,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
for (Entity entity1 : entity.getPassengers()) { for (Entity entity1 : entity.getPassengers()) {
this.tickPassenger(entity, entity1); this.tickPassenger(entity, entity1);
} }
@ -358,7 +358,7 @@ index 26d92a2ef..111869fce 100644
private void applyMovementEmissionAndPlaySound(Entity.MovementEmission entity_movementemission, Vec3D vec3d, BlockPosition blockposition, IBlockData iblockdata) { 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 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 4fed9669c..8dc1f4333 100644 index d2d6de827..325d5dae8 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -164,6 +164,8 @@ import org.bukkit.event.player.PlayerDropItemEvent; @@ -164,6 +164,8 @@ import org.bukkit.event.player.PlayerDropItemEvent;
@ -459,7 +459,7 @@ index 1dc65bcb3..d93940fb5 100644
} }
diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
index fa9f22a38..601b24af4 100644 index 17231dbab..1367de17b 100644
--- a/src/main/java/net/minecraft/world/level/World.java --- a/src/main/java/net/minecraft/world/level/World.java
+++ b/src/main/java/net/minecraft/world/level/World.java +++ b/src/main/java/net/minecraft/world/level/World.java
@@ -100,6 +100,7 @@ import net.minecraft.world.level.dimension.WorldDimension; @@ -100,6 +100,7 @@ import net.minecraft.world.level.dimension.WorldDimension;

12
CraftBukkit-Patches/0011-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From 8a7115a73598c0826420eb39b835585558bc9dbb Mon Sep 17 00:00:00 2001 From af59d606c76f6df7dc0c73d8935170893c33b43c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 2 Nov 2024 18:16:11 +1100 Date: Sat, 2 Nov 2024 18:16:11 +1100
Subject: [PATCH] Entity Activation Range Subject: [PATCH] Entity Activation Range
@ -9,10 +9,10 @@ This will drastically cut down on tick timings for entities that are not in rang
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay. This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 7e8a46715..3fa80f956 100644 index 34c4d8464..3ee75d6ce 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java --- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -423,6 +423,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -425,6 +425,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
gameprofilerfiller.pop(); gameprofilerfiller.pop();
} }
@ -20,7 +20,7 @@ index 7e8a46715..3fa80f956 100644
timings.entityTick.startTiming(); // Spigot timings.entityTick.startTiming(); // Spigot
this.entityTickList.forEach((entity) -> { this.entityTickList.forEach((entity) -> {
if (!entity.isRemoved()) { if (!entity.isRemoved()) {
@@ -856,6 +857,13 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -858,6 +859,13 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
} }
public void tickNonPassenger(Entity entity) { public void tickNonPassenger(Entity entity) {
@ -35,7 +35,7 @@ index 7e8a46715..3fa80f956 100644
entity.setOldPosAndRot(); entity.setOldPosAndRot();
GameProfilerFiller gameprofilerfiller = Profiler.get(); GameProfilerFiller gameprofilerfiller = Profiler.get();
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 9c78b7d2c..0265f8551 100644 index 111869fce..dca61d83b 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
@@ -339,6 +339,12 @@ public abstract class Entity implements SyncedDataHolder, INamableTileEntity, En @@ -339,6 +339,12 @@ public abstract class Entity implements SyncedDataHolder, INamableTileEntity, En
@ -125,7 +125,7 @@ index 8f1dbca8a..ba5cc953c 100644
public void tick() { public void tick() {
super.tick(); super.tick();
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 8d8cf895b..8932d4c87 100644 index 325d5dae8..8d14f6349 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -291,6 +291,13 @@ public abstract class EntityLiving extends Entity implements Attackable { @@ -291,6 +291,13 @@ public abstract class EntityLiving extends Entity implements Attackable {

8
CraftBukkit-Patches/0018-Properly-Close-Inventories.patch
View file

@ -1,4 +1,4 @@
From 1c277da76fb4f88c338bd395c2ccd6829fc03697 Mon Sep 17 00:00:00 2001 From 16cbf094cdfb0bf33b6fcf958ede648f79af797b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Thu, 27 Jun 2013 17:26:09 +1000 Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories Subject: [PATCH] Properly Close Inventories
@ -6,10 +6,10 @@ Subject: [PATCH] Properly Close Inventories
Properly close inventories when unloading and switching worlds. Properly close inventories when unloading and switching worlds.
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 3fa80f956..20998ccfb 100644 index 3ee75d6ce..330d8f816 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java --- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -1122,6 +1122,15 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -1124,6 +1124,15 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
} }
public void unload(Chunk chunk) { public void unload(Chunk chunk) {
@ -25,7 +25,7 @@ index 3fa80f956..20998ccfb 100644
chunk.clearAllBlockEntities(); chunk.clearAllBlockEntities();
chunk.unregisterTickContainerFromLevel(this); chunk.unregisterTickContainerFromLevel(this);
} }
@@ -2000,6 +2009,13 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -2006,6 +2015,13 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
public void onTrackingEnd(Entity entity) { public void onTrackingEnd(Entity entity) {
org.spigotmc.AsyncCatcher.catchOp("entity unregister"); // Spigot org.spigotmc.AsyncCatcher.catchOp("entity unregister"); // Spigot

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

@ -1,14 +1,14 @@
From c13ec59008af98f6d476de65c78a18919128454d Mon Sep 17 00:00:00 2001 From 6a0e47a177d30c3da338b018c5f1dd44c487adce Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com> From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400 Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a8cabe99f..0415de8f4 100644 index 33172774d..2a40aadc6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2096,6 +2096,18 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -2089,6 +2089,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
// Spigot start // Spigot start
private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot() private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
{ {

6
CraftBukkit-Patches/0060-Plug-WorldMap-Memory-Leak.patch
View file

@ -1,14 +1,14 @@
From 69e887adaf3aa14241656165fb1b542e044f3c09 Mon Sep 17 00:00:00 2001 From 275775d22fbf40d25f75b380fdc3c72f968c1ae0 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Fri, 8 Aug 2014 19:57:03 +1000 Date: Fri, 8 Aug 2014 19:57:03 +1000
Subject: [PATCH] Plug WorldMap Memory Leak Subject: [PATCH] Plug WorldMap Memory Leak
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 20998ccfb..66175cdca 100644 index 330d8f816..c357de8d9 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java --- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -2009,6 +2009,29 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -2015,6 +2015,29 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
public void onTrackingEnd(Entity entity) { public void onTrackingEnd(Entity entity) {
org.spigotmc.AsyncCatcher.catchOp("entity unregister"); // Spigot org.spigotmc.AsyncCatcher.catchOp("entity unregister"); // Spigot

6
CraftBukkit-Patches/0074-Configurable-Thunder-Chance.patch
View file

@ -1,14 +1,14 @@
From 408786a657f622559cf1957c591d3599438fdb29 Mon Sep 17 00:00:00 2001 From a4cd99095e3b29563a00d935df685bc14a13be41 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 24 Oct 2021 20:29:25 +1100 Date: Sun, 24 Oct 2021 20:29:25 +1100
Subject: [PATCH] Configurable Thunder Chance Subject: [PATCH] Configurable Thunder Chance
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 66175cdca..4a7efe66e 100644 index c357de8d9..6df14e88d 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java --- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -556,7 +556,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA @@ -558,7 +558,7 @@ public class WorldServer extends World implements ServerEntityGetter, GeneratorA
GameProfilerFiller gameprofilerfiller = Profiler.get(); GameProfilerFiller gameprofilerfiller = Profiler.get();
gameprofilerfiller.push("thunder"); gameprofilerfiller.push("thunder");