diff --git a/gradle.properties b/gradle.properties index 210f65c87..7e8d81124 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19-R0.1-SNAPSHOT -paperCommit = 8141349df1caad090401c3960cdf97a90ba7a50d +paperCommit = 99aa5f2fa57ccc17f936d51097d2b01504aa72dd org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0066-Item-entity-immunities.patch b/patches/server/0066-Item-entity-immunities.patch index 41325c390..77b670f4f 100644 --- a/patches/server/0066-Item-entity-immunities.patch +++ b/patches/server/0066-Item-entity-immunities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index a78cc85ba2acca982097317d56e7074c6042effd..67cb760da4683c7031e51766a8f928eadd937de0 100644 +index d98c489a58c8c2e657a8879b991aa57ef78f5015..8a36478ae555d3becf6e210092854221d3428cd2 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -2269,7 +2269,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -2275,7 +2275,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider public class TrackedEntity { @@ -18,7 +18,7 @@ index a78cc85ba2acca982097317d56e7074c6042effd..67cb760da4683c7031e51766a8f928ea private final int range; SectionPos lastSectionPos; diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index 0bc963fc214da203a6e505fdd5edee3b1efc03df..d8cb1d7cdd2d0ab28eaf3c91a0316af102f702e1 100644 +index 946cde51334568c62d9546254a8d4e5d46d95324..854e68c3d4b714e8b68eeec95e90fac9ecf7a517 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -65,7 +65,7 @@ public class ServerEntity { @@ -31,7 +31,7 @@ index 0bc963fc214da203a6e505fdd5edee3b1efc03df..d8cb1d7cdd2d0ab28eaf3c91a0316af1 public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer> consumer, Set trackedPlayers) { this.trackedPlayers = trackedPlayers; diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index 7e927dec3e4e4fb65bf89a87cfa555045c58bb3a..fcdcdc54bf58ed159695990a3c05486b87a96a35 100644 +index ae4b251e10babb07055d031ff48ac7dd5d4be4a0..1e9f3d5f52a34a9ce70f6e57ad53a24df5e22c4b 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java @@ -55,6 +55,12 @@ public class ItemEntity extends Entity { @@ -47,7 +47,7 @@ index 7e927dec3e4e4fb65bf89a87cfa555045c58bb3a..fcdcdc54bf58ed159695990a3c05486b public ItemEntity(EntityType type, Level world) { super(type, world); -@@ -332,6 +338,15 @@ public class ItemEntity extends Entity { +@@ -328,6 +334,15 @@ public class ItemEntity extends Entity { return false; } else if (!this.getItem().getItem().canBeHurtBy(source)) { return false; @@ -63,7 +63,7 @@ index 7e927dec3e4e4fb65bf89a87cfa555045c58bb3a..fcdcdc54bf58ed159695990a3c05486b } else if (this.level.isClientSide) { return true; } else { -@@ -517,6 +532,12 @@ public class ItemEntity extends Entity { +@@ -513,6 +528,12 @@ public class ItemEntity extends Entity { this.getEntityData().set(ItemEntity.DATA_ITEM, stack); this.getEntityData().markDirty(ItemEntity.DATA_ITEM); // CraftBukkit - SPIGOT-4591, must mark dirty this.despawnRate = level.paperConfig().entities.spawning.altItemDespawnRate.enabled ? level.paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), level.spigotConfig.itemDespawnRate) : level.spigotConfig.itemDespawnRate; // Paper diff --git a/patches/server/0254-Dont-eat-blocks-in-non-ticking-chunks.patch b/patches/server/0254-Dont-eat-blocks-in-non-ticking-chunks.patch index d248dca3e..41bfd647f 100644 --- a/patches/server/0254-Dont-eat-blocks-in-non-ticking-chunks.patch +++ b/patches/server/0254-Dont-eat-blocks-in-non-ticking-chunks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Dont eat blocks in non ticking chunks diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 67cb760da4683c7031e51766a8f928eadd937de0..ef501b2a84511ff5d7be0eb2dedce293eff2bb4c 100644 +index 8a36478ae555d3becf6e210092854221d3428cd2..1f73174c097695afbd63b01b2ecbceaa3bbbc77e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -1820,7 +1820,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1826,7 +1826,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider return this.anyPlayerCloseEnoughForSpawning(this.getUpdatingChunkIfPresent(chunkcoordintpair.toLong()), chunkcoordintpair, reducedRange); }