Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-22 16:29:26 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Dreeam
2024-05-28 18:02:07 +08:00
parent 876e3b3853
commit 4ddda03524
29 changed files with 121 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=org.galemc.gale
version=1.20.6-R0.1-SNAPSHOT
mcVersion=1.20.6
paperRef=4e10fadfdc8f854feeabf916c23a71e21fb0b29f
paperRef=23fe1166d4fa24ec81243f79e8dbb01dee4ab948
org.gradle.caching=true
org.gradle.parallel=true

10
patches/server/0008-Gale-configuration.patch
View File

@@ -337,7 +337,7 @@ index ca56a0b596976448da6bb2a0e82b3d5cd4133e12..40db66b168b8927b3d3dd8ec2bf77c22
this.convertable = convertable_conversionsession;
this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 0a8eeebb2d702ebcefd9f26cc0f41d1eab497902..75391e04fcd559f09e2a29c71f788761f71f2ad6 100644
index 14281a4e72f49dc4eb2ca3da8479c1f81a3a175d..01453ffd7e47933dd65fddba9be8e71f3a51cc46 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -12,7 +12,6 @@ import java.util.function.Supplier;
@@ -365,7 +365,7 @@ index 0a8eeebb2d702ebcefd9f26cc0f41d1eab497902..75391e04fcd559f09e2a29c71f788761
// CraftBukkit end
public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -168,6 +166,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -169,6 +167,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
return this.paperConfig;
}
// Paper end - add paper world config
@@ -378,7 +378,7 @@ index 0a8eeebb2d702ebcefd9f26cc0f41d1eab497902..75391e04fcd559f09e2a29c71f788761
public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
@@ -204,9 +208,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -205,9 +209,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public abstract ResourceKey<LevelStem> getTypeKey();
@@ -391,7 +391,7 @@ index 0a8eeebb2d702ebcefd9f26cc0f41d1eab497902..75391e04fcd559f09e2a29c71f788761
this.world = new CraftWorld((ServerLevel) 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 af015237214cebc4d1c4bb9e9c5f939d433e365c..31c461503fd4fbdac5b144537913c1fa8e1a70b7 100644
index 94a31c8f903eb61eb6d203e8e6fe8fb0beca28b1..c022f41153c84fb087b5a6eb7ae1df472f4186e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1033,6 +1033,7 @@ public final class CraftServer implements Server {
@@ -402,7 +402,7 @@ index af015237214cebc4d1c4bb9e9c5f939d433e365c..31c461503fd4fbdac5b144537913c1fa
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -3029,6 +3030,14 @@ public final class CraftServer implements Server {
@@ -3030,6 +3031,14 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

58
patches/server/0017-Remove-vanilla-profiler.patch
View File

@@ -985,10 +985,10 @@ index 40db66b168b8927b3d3dd8ec2bf77c22212142ce..db21e92d1e81e34a80342581107e20a3
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a645ad66af061966c5e47cae677026b35a55c486..1d4e65d9ca42980b272432fcb0b9627d6b299978 100644
index 6a4637eef14cbd84bbe26ef16f004b8f93367a3d..85a61984d241fe702e2cda22e5ea5dde239084f3 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1290,7 +1290,6 @@ public class ServerPlayer extends Player {
@@ -1291,7 +1291,6 @@ public class ServerPlayer extends Player {
PortalInfo shapedetectorshape = this.findDimensionEntryPoint(worldserver);
if (shapedetectorshape != null) {
@@ -996,7 +996,7 @@ index a645ad66af061966c5e47cae677026b35a55c486..1d4e65d9ca42980b272432fcb0b9627d
worldserver = shapedetectorshape.world; // CraftBukkit
if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event
if (resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit
@@ -1313,8 +1312,6 @@ public class ServerPlayer extends Player {
@@ -1314,8 +1313,6 @@ public class ServerPlayer extends Player {
worldserver = ((CraftWorld) exit.getWorld()).getHandle();
// CraftBukkit end
@@ -1005,7 +1005,7 @@ index a645ad66af061966c5e47cae677026b35a55c486..1d4e65d9ca42980b272432fcb0b9627d
if (true) { // CraftBukkit
this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
@@ -1331,7 +1328,6 @@ public class ServerPlayer extends Player {
@@ -1332,7 +1329,6 @@ public class ServerPlayer extends Player {
this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
this.connection.resetPosition();
worldserver.addDuringPortalTeleport(this);
@@ -1136,10 +1136,10 @@ index 298e3eddd600f0b2e48ce2d4080cf68adff59a3a..61a7c2e1d073e5b4b7947618b57bef5a
protected abstract T prepare(ResourceManager manager, ProfilerFiller profiler);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05730d3b09 100644
index 4ee843dfd826772c9157ca421d8fe1f36f814b51..7ff046e6e1e8f532ab7347beaeac898c57157cc2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -877,7 +877,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -876,7 +876,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// CraftBukkit end
public void baseTick() {
@@ -1147,7 +1147,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Prevent entity loading causing async lookups
this.inBlockState = null;
if (this.isPassenger() && this.getVehicle().isRemoved()) {
@@ -938,7 +937,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -937,7 +936,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
this.firstTick = false;
@@ -1155,7 +1155,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
}
public void setSharedFlagOnFire(boolean onFire) {
@@ -1155,7 +1153,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1154,7 +1152,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
}
@@ -1163,7 +1163,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
movement = movement.multiply(this.stuckSpeedMultiplier);
this.stuckSpeedMultiplier = Vec3.ZERO;
@@ -1164,7 +1161,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1163,7 +1160,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// Paper start - ignore movement changes while inactive.
if (isTemporarilyActive && !(this instanceof ItemEntity) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
setDeltaMovement(Vec3.ZERO);
@@ -1171,7 +1171,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
return;
}
// Paper end
@@ -1185,8 +1181,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1184,8 +1180,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
}
@@ -1180,7 +1180,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
boolean flag = !Mth.equal(movement.x, vec3d1.x);
boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
@@ -1204,9 +1198,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1203,9 +1197,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
BlockState iblockdata = this.level().getBlockState(blockposition);
this.checkFallDamage(vec3d1.y, this.onGround(), iblockdata, blockposition);
@@ -1191,7 +1191,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
if (this.horizontalCollision) {
Vec3 vec3d2 = this.getDeltaMovement();
@@ -1342,8 +1334,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1341,8 +1333,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
if (this.isOnFire() && (this.isInPowderSnow || this.isInWaterRainOrBubble())) {
this.setRemainingFireTicks(-this.getFireImmuneTicks());
}
@@ -1200,7 +1200,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
}
}
// Paper start - detailed watchdog information
@@ -3226,7 +3216,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3225,7 +3215,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey);
if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
@@ -1208,7 +1208,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
this.portalTime = i;
// Paper start - Add EntityPortalReadyEvent
io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
@@ -3244,7 +3233,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3243,7 +3232,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
} // Paper - Add EntityPortalReadyEvent
// CraftBukkit end
@@ -1216,7 +1216,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
}
this.isInsidePortal = false;
@@ -3704,14 +3692,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3703,14 +3691,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
// Paper end - Fix item duplication and teleport issues
if (this.level() instanceof ServerLevel && !this.isRemoved()) {
@@ -1231,7 +1231,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit
if (shapedetectorshape == null) {
@@ -3750,7 +3736,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3749,7 +3735,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.unRide();
// CraftBukkit end
@@ -1239,7 +1239,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
// Paper start - Fix item duplication and teleport issues
if (this instanceof Mob) {
((Mob) this).dropLeash(true, true); // Paper drop lead
@@ -3777,10 +3762,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3776,10 +3761,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
this.removeAfterChangingDimensions();
@@ -1251,7 +1251,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..f76a56c20b028c88687f509340b99b05
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ef0f118aecf0893e45cb9423a677d7e42496324b..f8a313a970e01929b07b3e2bbec8ff7735dbc0e3 100644
index 0ddf2e1a6d2ea836f8a140a435721e0ce96bd8d2..7175edc9539c7485a87a7f038a4b567302ab9589 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -418,7 +418,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1344,7 +1344,7 @@ index ef0f118aecf0893e45cb9423a677d7e42496324b..f8a313a970e01929b07b3e2bbec8ff77
if (((ServerLevel) this.level()).hasEntityMoveEvent && !(this instanceof net.minecraft.world.entity.player.Player)) {
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index e89f9c3e887601d8461eb967ae0bf582b672f631..a52538ddbadfaa40021462e15224e8a1ed6312a2 100644
index 9f42563699508fcb3d8a96cfdfc25a7bffd99759..8c8d944fd27bb70bb34db6f9ea4c069bebb8ba05 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -37,7 +37,6 @@ import net.minecraft.sounds.SoundEvent;
@@ -1649,7 +1649,7 @@ index 290d41136f5ec7671bc4990dfe50da0a770c124d..53dbe9d296a89d23b19f2551b20b4647
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
index 02e49c7ae5e120302b6479cf3e3934b9217eebf0..55d2144af223a2813b784e6e249fe94f610ef079 100644
index 376bcbc189008464f4d518c1e07643431ba96306..a6b6dd1715f7cb278b66381cbb0dd9d7069ce6ed 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -192,12 +192,8 @@ public class Goat extends Animal {
@@ -1802,7 +1802,7 @@ index 082b804f4793f72e76361f5427f0358273454b3d..0772060d96c4fc9dfaf84081be6ccae9
if (this.fire) {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 75391e04fcd559f09e2a29c71f788761f71f2ad6..7f6f50a33e017b671cdc3a21e618bb71365b2136 100644
index 01453ffd7e47933dd65fddba9be8e71f3a51cc46..118d1a5aedce3f478f47b9e36cf419c15f3bd7ca 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -131,7 +131,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1813,7 +1813,7 @@ index 75391e04fcd559f09e2a29c71f788761f71f2ad6..7f6f50a33e017b671cdc3a21e618bb71
public final boolean isClientSide;
private final WorldBorder worldBorder;
private final BiomeManager biomeManager;
@@ -208,7 +207,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -209,7 +208,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public abstract ResourceKey<LevelStem> getTypeKey();
@@ -1822,7 +1822,7 @@ index 75391e04fcd559f09e2a29c71f788761f71f2ad6..7f6f50a33e017b671cdc3a21e618bb71
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
this.galeConfig = galeWorldConfigCreator.apply(this.spigotConfig); // Gale - Gale configuration
@@ -223,7 +222,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -224,7 +223,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
// CraftBukkit end
@@ -1830,7 +1830,7 @@ index 75391e04fcd559f09e2a29c71f788761f71f2ad6..7f6f50a33e017b671cdc3a21e618bb71
this.levelData = worlddatamutable;
this.dimensionTypeRegistration = holder;
final DimensionType dimensionmanager = (DimensionType) holder.value();
@@ -1253,9 +1251,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1254,9 +1252,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
protected void tickBlockEntities() {
@@ -1840,7 +1840,7 @@ index 75391e04fcd559f09e2a29c71f788761f71f2ad6..7f6f50a33e017b671cdc3a21e618bb71
this.timings.tileEntityPending.startTiming(); // Spigot
this.tickingBlockEntities = true;
if (!this.pendingBlockEntityTickers.isEmpty()) {
@@ -1296,7 +1291,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1297,7 +1292,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
this.timings.tileEntityTick.stopTiming(); // Spigot
this.tickingBlockEntities = false;
co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
@@ -1848,7 +1848,7 @@ index 75391e04fcd559f09e2a29c71f788761f71f2ad6..7f6f50a33e017b671cdc3a21e618bb71
this.spigotConfig.currentPrimedTnt = 0; // Spigot
}
@@ -1511,7 +1505,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1512,7 +1506,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@Override
public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -1856,7 +1856,7 @@ index 75391e04fcd559f09e2a29c71f788761f71f2ad6..7f6f50a33e017b671cdc3a21e618bb71
List<Entity> list = Lists.newArrayList();
((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call
return list;
@@ -1530,7 +1523,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1531,7 +1524,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public <T extends Entity> void getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate, List<? super T> result, int limit) {
@@ -1864,7 +1864,7 @@ index 75391e04fcd559f09e2a29c71f788761f71f2ad6..7f6f50a33e017b671cdc3a21e618bb71
// Paper start - optimise this call
//TODO use limit
if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) {
@@ -1785,11 +1777,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1786,11 +1778,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {
@@ -1920,7 +1920,7 @@ index c5454b92ca2565461c799d7340160f9fb72c1b0f..a1a4b99167919bedb8a45c3b81889f58
- }
}
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 2a8609e33716949ff1877b6d10f64a9d7a7c81e9..b38cdfdd3681b4f0fe537d4100b14bd017331118 100644
index 14ee7b5b9b804bebd4e2a846b238547a28a36035..1bee0c58ca6acf734e060b4ef6b0b5b42b868613 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -26,7 +26,6 @@ import net.minecraft.network.FriendlyByteBuf;

4
patches/server/0023-Move-random-tick-random.patch
View File

@@ -31,10 +31,10 @@ index db21e92d1e81e34a80342581107e20a314415481..10723ae32ff7c293ee6c67d8a62e1af6
public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 7f6f50a33e017b671cdc3a21e618bb71365b2136..ded50c5fb9ae139f436dce76db3a33a965a828f7 100644
index 118d1a5aedce3f478f47b9e36cf419c15f3bd7ca..42750bdde718f9047f008afbb12c0836e9c3d089 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -181,6 +181,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -182,6 +182,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Faster redstone torch rapid clock removal; Move from Map in BlockRedstoneTorch to here

4
patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch
View File

@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 34c7e2b7f5799291b6adbeb9063c023e89ff51f1..5756ea8ca76f47118ac0b06a02c5663b1b544518 100644
index c022f41153c84fb087b5a6eb7ae1df472f4186e6..e9c6087c2b6cae716384d28970eac3edad001d2a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1125,6 +1125,13 @@ public final class CraftServer implements Server {
@@ -45,6 +45,6 @@ index 34c7e2b7f5799291b6adbeb9063c023e89ff51f1..5756ea8ca76f47118ac0b06a02c5663b
+ getLogger().log(Level.SEVERE, " " + element.toString());
+ }
+ // Gale end - Airplane - print stack trace for plugins not shutting down tasks
if (console.isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread(worker.getThread(), "still running"); // Paper - Debugging
}
}
// Paper end - Wait for Async Tasks during shutdown

8
patches/server/0033-Improve-container-checking-with-a-bitset.patch
View File

@@ -265,7 +265,7 @@ index f402dbbfe3a443e6bc51f88b85abe937852b52f0..2c6388d892d0b58ba1800b795418fc95
float DEFAULT_DISTANCE_BUFFER = 4.0F;
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
index 2704389bc3ec6dbbf1b568a4380972f8c0d62d15..d6c2455f41024dd839986cce70fd27d804c3da58 100644
index 9549eee0d92f322bd5232abd7e695213660c2e22..297e13ccc47cf1d4fa92f41bb84f04df89322001 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
@@ -30,7 +30,10 @@ import org.bukkit.inventory.InventoryHolder;
@@ -279,7 +279,7 @@ index 2704389bc3ec6dbbf1b568a4380972f8c0d62d15..d6c2455f41024dd839986cce70fd27d8
@Nullable
public ResourceKey<LootTable> lootTable;
public long lootTableSeed;
@@ -92,12 +95,18 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
@@ -86,12 +89,18 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
protected AbstractMinecartContainer(EntityType<?> type, Level world) {
super(type, world);
@@ -300,10 +300,10 @@ index 2704389bc3ec6dbbf1b568a4380972f8c0d62d15..d6c2455f41024dd839986cce70fd27d8
}
@Override
@@ -166,6 +175,10 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
@@ -158,6 +167,10 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
@Override
protected void readAdditionalSaveData(CompoundTag nbt) {
super.readAdditionalSaveData(nbt);
this.lootableData.loadNbt(nbt); // Paper
+ // Gale start - Airplane - improve container checking with a bitset
+ this.itemStacksOptimized = new gg.airplane.structs.ItemListWithBitset(this.getContainerSize());
+ this.itemStacks = this.itemStacksOptimized.nonNullList;

6
patches/server/0036-Inline-level-height.patch
View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index ded50c5fb9ae139f436dce76db3a33a965a828f7..b335b738ef1f9c1cfecfab26e6653e2fa9500848 100644
index 42750bdde718f9047f008afbb12c0836e9c3d089..e5c640b4353d2fb09ebb2e7d498f704cc9a6acfa 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -209,6 +209,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -210,6 +210,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public abstract ResourceKey<LevelStem> getTypeKey();
@@ -50,7 +50,7 @@ index ded50c5fb9ae139f436dce76db3a33a965a828f7..b335b738ef1f9c1cfecfab26e6653e2f
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.function.Function<org.spigotmc.SpigotWorldConfig, GaleWorldConfiguration> galeWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor // Gale - Gale configuration // Gale - Purpur - remove vanilla profiler
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -228,6 +237,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -229,6 +238,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
this.dimensionTypeRegistration = holder;
final DimensionType dimensionmanager = (DimensionType) holder.value();

4
patches/server/0040-Reduce-entity-allocations.patch
View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index c3f260004ca0577f19cb047071969e173a303081..1549876d9888571449d54461024c331580ea7bf7 100644
index 7ff046e6e1e8f532ab7347beaeac898c57157cc2..2e784ad7c5e38ce74f3bcf0f20718422e3335c98 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -504,6 +504,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -503,6 +503,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
}
// Paper end - optimise entity tracking

4
patches/server/0041-Remove-lambda-from-ticking-guard.patch
View File

@@ -57,10 +57,10 @@ index 820836ca964f7785099eb685b7cb1757ac61c12b..4bb9e099b647a6a524395d9e5393ef6f
}
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index b335b738ef1f9c1cfecfab26e6653e2fa9500848..5d8c9c56d30cd74ffe5941832978d72f421d3639 100644
index e5c640b4353d2fb09ebb2e7d498f704cc9a6acfa..88ccc42e3768db0a11962a880ca14fe9847c0cdb 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1316,13 +1316,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1317,13 +1317,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
try {
tickConsumer.accept(entity);
MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick

8
patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch
View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 5b5f96c70fa5ae811f7bc1809897e6795ff83e42..a5c6d704bcd412ab7471ba39049eaf1026da8438 100644
index 2e784ad7c5e38ce74f3bcf0f20718422e3335c98..899cf208b8059600b364ae0d64b2a041620c3da3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4468,16 +4468,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4467,16 +4467,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -60,7 +60,7 @@ index 5b5f96c70fa5ae811f7bc1809897e6795ff83e42..a5c6d704bcd412ab7471ba39049eaf10
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4485,14 +4487,61 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4484,14 +4486,61 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -128,7 +128,7 @@ index 5b5f96c70fa5ae811f7bc1809897e6795ff83e42..a5c6d704bcd412ab7471ba39049eaf10
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4514,9 +4563,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4513,9 +4562,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// CraftBukkit end
}
}

6
patches/server/0045-Optimize-entity-coordinate-key.patch
View File

@@ -22,7 +22,7 @@ data is already available in the blockPosition struct, so we use that
instead of re-doing the casting.
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
index 15dddb035c7ae3aca9b5cd5a5f56e0407641d9dd..7d941808d1cf3ba22ee8c358d63ea6e289609184 100644
index d2ce6f2e78b3a8297a2a0b9752ed8140158e33f7..7287772498685c7ed4ffaeafb3e09aadafde5272 100644
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
@@ -213,7 +213,7 @@ public final class MCUtil {
@@ -35,10 +35,10 @@ index 15dddb035c7ae3aca9b5cd5a5f56e0407641d9dd..7d941808d1cf3ba22ee8c358d63ea6e2
public static long getCoordinateKey(final ChunkPos pair) {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index d0fa080acc1877fe66672387c0b1f00e6cebf041..2ff752dfc7dcee936611613da934ccebe45c1cae 100644
index 899cf208b8059600b364ae0d64b2a041620c3da3..ec36674769993816b22886d90a2f73e3e548917c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -312,7 +312,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -311,7 +311,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public double yo;
public double zo;
private Vec3 position;

4
patches/server/0048-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
View File

@@ -26,10 +26,10 @@ search to attempt respawning the ender dragon whenever a player places
an end crystal.
diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
index dd1bdb4bb87a3a59c229ba76b36841d199717624..ded33fd166cbb95917f7e321875acc4222caff46 100644
index 5f51e64cb0611a4ba6bdcdcacbcba1063a7f3a5c..50312825fade96ccc8c1231ca1eaf6c36d892746 100644
--- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java
+++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
@@ -54,11 +54,13 @@ public class EndCrystalItem extends Item {
@@ -55,11 +55,13 @@ public class EndCrystalItem extends Item {
// CraftBukkit end
world.addFreshEntity(entityendercrystal);
world.gameEvent((Entity) context.getPlayer(), (Holder) GameEvent.ENTITY_PLACE, blockposition1);

18
patches/server/0050-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
View File

@@ -12,15 +12,15 @@ By: Aikar <aikar@aikar.co>
As part of: EmpireCraft (https://github.com/starlis/empirecraft)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
index 17da915ffa638500a83b67db0940a7b9a9b333a1..e47c9481f39426e1767e73275edbf9a1d298caea 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
@@ -74,6 +74,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
diff --git a/src/main/java/net/minecraft/world/RandomizableContainer.java b/src/main/java/net/minecraft/world/RandomizableContainer.java
index feb35fba0c56445ee910dbe1af9b36f21b4ec480..caf46a9b978c0cada8530142e6ccf8bb0f371c1c 100644
--- a/src/main/java/net/minecraft/world/RandomizableContainer.java
+++ b/src/main/java/net/minecraft/world/RandomizableContainer.java
@@ -81,6 +81,7 @@ public interface RandomizableContainer extends Container {
}
@Override
public void unpackLootTable(@org.jetbrains.annotations.Nullable final Player player) {
default void unpackLootTable(@Nullable Player player) {
+ if (player == null) return; // Gale - EMC - don't trigger lootable refresh for non-player interaction
// Copied from super with changes, always check the original method
net.minecraft.world.level.Level level = this.getLevel();
Level level = this.getLevel();
BlockPos blockPos = this.getBlockPos();
ResourceKey<LootTable> resourceKey = this.getLootTable();

18
patches/server/0078-Reduce-array-allocations.patch
View File

@@ -405,7 +405,7 @@ index 244a19ecd0234fa1d7a6ecfea20751595688605d..f76ca394169d844a263a53c31c30e57d
OptionSpec<Integer> optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1, new Integer[0]);
OptionSpec<String> optionspec12 = optionparser.accepts("serverId").withRequiredArg();
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 4a5dc0c552bbd48cb79e29016ea455882cf13744..db3c9d0d1428549ca6955120661cae38e40f7f8a 100644
index 695ace938f5eb6b44649014511bbe64f2ff6961a..73f7d1af9ec545535d980afaa0ed11bb7e82f2b4 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -350,7 +350,7 @@ public class ServerEntity {
@@ -449,7 +449,7 @@ index 4bb9e099b647a6a524395d9e5393ef6f2fdc9153..5ec5ed9ac62fda568fd011dd62b1c5a2
return ret;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 59b157545b562ea94ffbc42c8174f4c573d79399..50bf9b83614bbfc1ed76c08d6fea113a1a771b25 100644
index ae6b88b5ab67568930ef76ff0c8bbb55ac36cf38..89969a664d0008fe5bbcde11e10b842786865d47 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -29,6 +29,8 @@ import java.util.function.Consumer;
@@ -624,7 +624,7 @@ index eb3c12e03c0d5c9cec84d97e2c51c50ce59c23a4..9b29ec4e72e4cdf2a42868ca5659fdcf
private EquipmentSlot(final EquipmentSlot.Type type, final int entityId, final int armorStandId, final String name) {
this.type = type;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 91e3e4a126c1565538d190b5da552ba999c28ba8..8a1ff07671d2b1e6f5132d81733a00fd5d2179c1 100644
index 0beed50e9d517165a9e4a4b0b28148a2881d028a..02c1364213af03f5b97a0286f9100d40c39b445d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3233,7 +3233,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -637,7 +637,7 @@ index 91e3e4a126c1565538d190b5da552ba999c28ba8..8a1ff07671d2b1e6f5132d81733a00fd
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index a52538ddbadfaa40021462e15224e8a1ed6312a2..1b97a429c05ae8f77af3cea4852bac3966dd54e0 100644
index 8c8d944fd27bb70bb34db6f9ea4c069bebb8ba05..f0196c364934894e6fba98de8d8dcbf09d3644b8 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1173,7 +1173,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
@@ -690,10 +690,10 @@ index f38acc96f71298e40ce9433e7759fd223ca55e48..22ec9c1e74450f56cd1e390d59ca28f1
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 893efb2c4a07c33d41e934279dd914a9dbd4ef79..11342d0fd62473403de86794a8186b879315c703 100644
index 58c38bc4361ddf24716f326b0c6fc626d434756e..b6f7e5b5f853bb961283654200f648c769a71347 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1102,7 +1102,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -1104,7 +1104,7 @@ public final class ItemStack implements DataComponentHolder {
ItemAttributeModifiers itemattributemodifiers = (ItemAttributeModifiers) this.getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY);
if (itemattributemodifiers.showInTooltip()) {
@@ -745,7 +745,7 @@ index e158ff1a9dbd054985873e854fcf6c433102059c..4dbe4db3e7b005eabdec56e5047ad7bc
private static Enchantment register(String name, Enchantment enchantment) {
return Registry.register(BuiltInRegistries.ENCHANTMENT, name, enchantment);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 5d8c9c56d30cd74ffe5941832978d72f421d3639..ba2c1672a018dbd0a179e71f7166fb9df87782dd 100644
index 88ccc42e3768db0a11962a880ca14fe9847c0cdb..c97b031c6beca995599642b26dcb888f4977ed5f 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -10,6 +10,8 @@ import java.util.function.Consumer;
@@ -757,7 +757,7 @@ index 5d8c9c56d30cd74ffe5941832978d72f421d3639..ba2c1672a018dbd0a179e71f7166fb9d
import net.minecraft.CrashReport;
import net.minecraft.CrashReportCategory;
import net.minecraft.core.BlockPos;
@@ -1861,7 +1863,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1862,7 +1864,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public org.bukkit.entity.Entity[] getChunkEntities(int chunkX, int chunkZ) {
io.papermc.paper.world.ChunkEntitySlices slices = ((ServerLevel)this).getEntityLookup().getChunk(chunkX, chunkZ);
if (slices == null) {
@@ -880,7 +880,7 @@ index ae86c45c1d49c7646c721991910592091e7333f8..3bf62117fb052a4d10fd4ccd4e1b63ca
static {
set(EquipmentSlot.HAND, net.minecraft.world.entity.EquipmentSlot.MAINHAND);
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
index 6827979a5b270ced53b46ecb9eff548727dadb81..8cecb6eddee0c3cafaecc3cc4d7cf99f3ce1ccea 100644
index fdcc414f4fa246082ad0732133c870d915ae3084..33ed515d6e79c4135f3e7bbc25fd0e3d83d08540 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
@@ -165,7 +165,7 @@ public class CraftEntityEquipment implements EntityEquipment {

8
patches/server/0079-Optimize-sun-burn-tick.patch
View File

@@ -13,10 +13,10 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 2ff752dfc7dcee936611613da934ccebe45c1cae..cb4f71f93f45ec1e91e7ca883cfce93c2260c990 100644
index ec36674769993816b22886d90a2f73e3e548917c..b97253a6b43d4db39c22ae16b7e75bd95fb9d958 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -311,7 +311,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -310,7 +310,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public double xo;
public double yo;
public double zo;
@@ -25,7 +25,7 @@ index 2ff752dfc7dcee936611613da934ccebe45c1cae..cb4f71f93f45ec1e91e7ca883cfce93c
public BlockPos blockPosition; // Gale - Pufferfish - optimize entity coordinate key - private -> public
private ChunkPos chunkPosition;
private Vec3 deltaMovement;
@@ -2073,9 +2073,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -2072,9 +2072,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
/** @deprecated */
@Deprecated
public float getLightLevelDependentMagicValue() {
@@ -45,7 +45,7 @@ index 2ff752dfc7dcee936611613da934ccebe45c1cae..cb4f71f93f45ec1e91e7ca883cfce93c
this.absMoveTo(x, y, z);
this.setYRot(yaw % 360.0F);
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 1b97a429c05ae8f77af3cea4852bac3966dd54e0..e0e7c35fa9c9395eec5b4504e250ee2d58f98e30 100644
index f0196c364934894e6fba98de8d8dcbf09d3644b8..2d91941eb780de588202113700f68cca853eb62b 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1817,13 +1817,29 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti

8
patches/server/0096-Skip-entity-move-if-movement-is-zero.patch
View File

@@ -13,10 +13,10 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 28625d30998a116ddc01160c06e7c20d260ed51a..68048f017ac46493dd491051491dd30fa3c66a0c 100644
index b97253a6b43d4db39c22ae16b7e75bd95fb9d958..23350a4046a4071ef87f65b7341572a2bff0e8eb 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -320,6 +320,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -319,6 +319,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public float yRotO;
public float xRotO;
private AABB bb;
@@ -24,7 +24,7 @@ index 28625d30998a116ddc01160c06e7c20d260ed51a..68048f017ac46493dd491051491dd30f
public boolean onGround;
public boolean horizontalCollision;
public boolean verticalCollision;
@@ -1130,6 +1131,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1129,6 +1130,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// Paper end - detailed watchdog information
public void move(MoverType movementType, Vec3 movement) {
@@ -36,7 +36,7 @@ index 28625d30998a116ddc01160c06e7c20d260ed51a..68048f017ac46493dd491051491dd30f
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
// Paper start - detailed watchdog information
io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
@@ -4146,6 +4152,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4145,6 +4151,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public final void setBoundingBox(AABB boundingBox) {

4
patches/server/0101-Hide-flames-on-entities-with-fire-resistance.patch
View File

@@ -13,10 +13,10 @@ As part of: Slice (https://github.com/Cryptite/Slice)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index bdec8d108b7b5544c42d37667c53613cab35e8ea..394e7d59b0c625ed9f30e611a255768a98229e23 100644
index 23350a4046a4071ef87f65b7341572a2bff0e8eb..4f8bd45ac7278f06d9af82d6d3e0882cfc830929 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -935,7 +935,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -934,7 +934,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.checkBelowWorld();
if (!this.level().isClientSide) {

4
patches/server/0109-Load-portal-destination-chunk-before-entity-teleport.patch
View File

@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index fb23f3249a8530cc4f39fc0ddeea06a15fafc3f3..34f6bd162ac0fec6b46e3ae2689fada7e3ba0763 100644
index 4f8bd45ac7278f06d9af82d6d3e0882cfc830929..bd93d51b6a62b5f4d9e90290da27c73ec5ddcb06 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3765,6 +3765,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3764,6 +3764,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
Entity entity = this.getType().create(worldserver);
if (entity != null) {

6
patches/server/0111-Don-t-load-chunks-to-activate-climbing-entities.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 34f6bd162ac0fec6b46e3ae2689fada7e3ba0763..d9f183a863d3fc06ad2421d931884e62cd9d0586 100644
index bd93d51b6a62b5f4d9e90290da27c73ec5ddcb06..c2686e386f8aa421d9052b0c3ef30e7982abbe71 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4687,6 +4687,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4686,6 +4686,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return this.inBlockState;
}
@@ -28,7 +28,7 @@ index 34f6bd162ac0fec6b46e3ae2689fada7e3ba0763..d9f183a863d3fc06ad2421d931884e62
return this.chunkPosition;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 330b62dac10c01abc4dd22abe9eb85ccfd94ec53..bacd3170da4b8797bd979c1b5fd24c42d0d49219 100644
index 8faf10ecca6b1513a3ec0999d3b5b61953acbafc..15465978338f515140ba51a1f1b81f27ced34521 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2064,19 +2064,43 @@ public abstract class LivingEntity extends Entity implements Attackable {

4
patches/server/0112-Broadcast-crit-animations-as-the-entity-being-critte.patch
View File

@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a5aefd1224b8cd6957a0a9654075fa06c6a69d99..f42de5d493530d6b7fcfc27ba5a3b75533c0a29e 100644
index f4249ec6ea3afbc9976d292724d4fd1a42c95feb..47357cb475fcb834992f13a5e70cf0f3f1c76993 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2112,12 +2112,18 @@ public class ServerPlayer extends Player {
@@ -2113,12 +2113,18 @@ public class ServerPlayer extends Player {
@Override
public void crit(Entity target) {

8
patches/server/0117-CraftBukkit-UUID-to-world-map.patch
View File

@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e738c814f9b24e9a2593e9b91294a9f67231a5b4..69b23604d7a8ca40eb8b025d70dfd4803e9f3382 100644
index e9c6087c2b6cae716384d28970eac3edad001d2a..1ee326e8904f3a0e725b9dc4bc6e6decdb190b1b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -40,6 +40,9 @@ import java.util.logging.Logger;
@@ -34,7 +34,7 @@ index e738c814f9b24e9a2593e9b91294a9f67231a5b4..69b23604d7a8ca40eb8b025d70dfd480
// private final Map<Class<?>, Registry<?>> registries = new HashMap<>(); // Paper - replace with RegistryAccess
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
@@ -1450,6 +1454,7 @@ public final class CraftServer implements Server {
@@ -1451,6 +1455,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -42,7 +42,7 @@ index e738c814f9b24e9a2593e9b91294a9f67231a5b4..69b23604d7a8ca40eb8b025d70dfd480
this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
this.console.removeLevel(handle);
return true;
@@ -1468,12 +1473,7 @@ public final class CraftServer implements Server {
@@ -1469,12 +1474,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index e738c814f9b24e9a2593e9b91294a9f67231a5b4..69b23604d7a8ca40eb8b025d70dfd480
}
// Paper start
@@ -1491,6 +1491,7 @@ public final class CraftServer implements Server {
@@ -1492,6 +1492,7 @@ public final class CraftServer implements Server {
System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world.");
return;
}

4
patches/server/0119-Specific-interval-TPS-API.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 69b23604d7a8ca40eb8b025d70dfd4803e9f3382..3768a55c5e20ec47e2b1d41dacb1496006a30652 100644
index 1ee326e8904f3a0e725b9dc4bc6e6decdb190b1b..b95a138d76c19be285a1b9b0a096027650dd67aa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3081,6 +3081,24 @@ public final class CraftServer implements Server {
@@ -3082,6 +3082,24 @@ public final class CraftServer implements Server {
};
}

4
patches/server/0120-5-second-TPS-average.patch
View File

@@ -79,10 +79,10 @@ index d5113b3650ec45127246b18e1f64526bff1798e4..55ea6cd231128b7c2781e59a4fe51a02
tps5.add(currentTps, diff);
tps15.add(currentTps, diff);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3768a55c5e20ec47e2b1d41dacb1496006a30652..f895dc5840423c85d42e7ff7488866cc055aa290 100644
index b95a138d76c19be285a1b9b0a096027650dd67aa..7d1f6e96e04eff4625f32e843a4cbce3e2b59086 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3081,8 +3081,27 @@ public final class CraftServer implements Server {
@@ -3082,8 +3082,27 @@ public final class CraftServer implements Server {
};
}

4
patches/server/0122-Last-tick-time-API.patch
View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f895dc5840423c85d42e7ff7488866cc055aa290..32002eb8b7fd81ef1d0e2ca79292ccb1354b3b02 100644
index 7d1f6e96e04eff4625f32e843a4cbce3e2b59086..4cd21c40653dae6bb7ee145a67b5c849bd4f3093 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3310,4 +3310,22 @@ public final class CraftServer implements Server {
@@ -3311,4 +3311,22 @@ public final class CraftServer implements Server {
return this.potionBrewer;
}
// Paper end

4
patches/server/0125-For-collision-check-has-physics-before-same-vehicle.patch
View File

@@ -16,10 +16,10 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 3839f54583c0bbc73a0c48f1ef068ecf81c7553e..557b5e275adfce6447b41355373bc80162aa4e24 100644
index c2686e386f8aa421d9052b0c3ef30e7982abbe71..bd4f282293f2ba8976c35f5ad8b137392ef12c36 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2190,8 +2190,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -2189,8 +2189,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public void playerTouch(Player player) {}
public void push(Entity entity) {

4
patches/server/0126-Skip-negligible-planar-movement-multiplication.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 557b5e275adfce6447b41355373bc80162aa4e24..615193fbe7574d4d1d9e24a48655931edc2a35d3 100644
index bd4f282293f2ba8976c35f5ad8b137392ef12c36..f30b3aba1ee92aa6cb5425862502b0fdfe6e9768 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1294,9 +1294,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1293,9 +1293,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
this.tryCheckInsideBlocks();

6
patches/server/0127-Optimize-matching-item-checks.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 5c922ed680cdf54e7a1439e2181a3ba4151a1d4c..028359d6c48187c3d2b3e3d863a13e357c2f24e0 100644
index b6f7e5b5f853bb961283654200f648c769a71347..5bb861930d2e81d48d33121100d797ebca4394ea 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -830,7 +830,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -832,7 +832,7 @@ public final class ItemStack implements DataComponentHolder {
}
public static boolean matches(ItemStack left, ItemStack right) {
@@ -19,7 +19,7 @@ index 5c922ed680cdf54e7a1439e2181a3ba4151a1d4c..028359d6c48187c3d2b3e3d863a13e35
}
/** @deprecated */
@@ -850,11 +850,11 @@ public final class ItemStack implements DataComponentHolder {
@@ -852,11 +852,11 @@ public final class ItemStack implements DataComponentHolder {
}
public static boolean isSameItem(ItemStack left, ItemStack right) {

10
patches/server/0130-Reduce-RandomSource-instances.patch
View File

@@ -26,10 +26,10 @@ index b47a8a082170bcb630c4354be7c77a4cac71d105..b49e3f2cdc1fa5ff3723fae452404664
double d1 = (double) (center.y - maxRange);
double d2 = (double) (center.x + maxRange);
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index f42de5d493530d6b7fcfc27ba5a3b75533c0a29e..f4829e31111bb640901e8143ed3afa4de3e28b7d 100644
index 47357cb475fcb834992f13a5e70cf0f3f1c76993..9be1ba758cc3cac54501c39c05ea057dedeae610 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -479,7 +479,7 @@ public class ServerPlayer extends Player {
@@ -480,7 +480,7 @@ public class ServerPlayer extends Player {
long l = k * k;
int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
int j1 = this.getCoprime(i1);
@@ -38,7 +38,7 @@ index f42de5d493530d6b7fcfc27ba5a3b75533c0a29e..f4829e31111bb640901e8143ed3afa4d
for (int l1 = 0; l1 < i1; ++l1) {
int i2 = (k1 + j1 * l1) % i1;
@@ -516,7 +516,7 @@ public class ServerPlayer extends Player {
@@ -517,7 +517,7 @@ public class ServerPlayer extends Player {
long l = k * k;
int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
int j1 = this.getCoprime(i1);
@@ -61,7 +61,7 @@ index 0e0867d7add9a024bbe9471f8ff92bbb25996a3d..94ffa65fa99c4c713936f7004d9f46ac
}
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
index 35299affb699d745804a3b60cb78b9323f3e068e..4f68a92c6d2f46c6e8769d9dbbd24bcf92ca0b8e 100644
index 882de08963c72614a3d26cd917916e42b7136042..68fa6351f12c4e9de4029b89c15263e54b0f5f53 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
@@ -87,7 +87,7 @@ public class FishingHook extends Projectile {
@@ -96,7 +96,7 @@ index 774da40408225b0961b4dea50c4358a03d58b2ff..928d7895b2ba415ae8cd6b49a981f38e
this.level = world;
this.id = nbt.getInt("Id");
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index e927f278e0b5545a25cb9a17bcb4b7b3d79fb8f8..cef8eff688f7ec1793e8bca9ce05d9ad36003bc8 100644
index 0772060d96c4fc9dfaf84081be6ccae9fdee7aa5..eb152f9ab41fc7b7219f9be26b574d61506c55d5 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -93,7 +93,7 @@ public class Explosion {

19
patches/server/0131-Add-xor-shift-random.patch
View File

@@ -27,20 +27,11 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
index 6e72c43b9d3834eb91c02ce68e7d114ad907812d..f6f8e51cbdcfcbde9dc67d006867ae9daec09a4a 100644
index fea92d280c6817cee1f18379d5ed51a3a22ee344..fd5d7feb9670a14cc6f7daa8ce6ba6a2073ac96b 100644
--- a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
@@ -2,7 +2,7 @@ package com.destroystokyo.paper.loottable;
import io.papermc.paper.configuration.WorldConfiguration;
import io.papermc.paper.configuration.type.DurationOrDisabled;
-import java.time.temporal.ChronoUnit;
+
import java.util.concurrent.TimeUnit;
import org.bukkit.entity.Player;
import org.bukkit.loot.LootTable;
@@ -16,7 +16,7 @@ import java.util.UUID;
@@ -21,7 +21,7 @@ import org.checkerframework.framework.qual.DefaultQualifier;
@DefaultQualifier(NonNull.class)
public class PaperLootableInventoryData {
- private static final Random RANDOM = new Random();
@@ -75,7 +66,7 @@ index f2b20ed5063a293f0b464548f590d652170cd1d8..2abe6131cc04ed397446c2aa08f77f9d
public CraftWorld(ServerLevel world, ChunkGenerator gen, BiomeProvider biomeProvider, Environment env) {
this.world = world;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
index 1309fabd357eb9b8f90f882ec7ff3de9e60f187d..2eb85078a7da717602071e5463635b0b498416bb 100644
index 95e35c223f2ad9b6de6749544abd68de71e4f1ab..4370c27e5b7ab52092e261581558d793516af21d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
@@ -14,7 +14,7 @@ import org.bukkit.inventory.meta.FireworkMeta;
@@ -88,7 +79,7 @@ index 1309fabd357eb9b8f90f882ec7ff3de9e60f187d..2eb85078a7da717602071e5463635b0b
public CraftFirework(CraftServer server, FireworkRocketEntity entity) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index c3df5278231e13c43e9ea0804d95bf0542f2560a..abb8ff945b13c2cf4926a2f047d0e8dd074cea8f 100644
index 67125bbf3e3b37968b02908d441b21474579ce77..8fc6330817d2b3188f479c6c6a381e4d4f9872d5 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -10,6 +10,7 @@ import org.spongepowered.configurate.objectmapping.meta.PostProcess;