From 286984c3e2996a12c74746187954e98f1cd9191d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 30 Aug 2021 23:13:51 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly --- gradle.properties | 2 +- .../server/0001-Airplane-Server-Changes.patch | 28 +++++++++---------- ...019-PlayerSetSpawnerTypeWithEggEvent.patch | 4 +-- .../0020-EMC-MonsterEggSpawnEvent.patch | 6 ++-- .../server/0073-Item-entity-immunities.patch | 4 +-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index 72f003dbb..af199d9e7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT mcVersion = 1.17.1 packageVersion = 1_17_R1 -paperCommit = e8fe7fe00e4d0df7702d535b237740ebc303c5f6 +paperCommit = f30812499e83b8ad5f28a146e2794251bd524479 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Airplane-Server-Changes.patch b/patches/server/0001-Airplane-Server-Changes.patch index 04d0a8808..4acdb63b8 100644 --- a/patches/server/0001-Airplane-Server-Changes.patch +++ b/patches/server/0001-Airplane-Server-Changes.patch @@ -1694,10 +1694,10 @@ index 7b6c547e71230fbb3733f99a4597b3f5b51547b8..8242200f073aee40482b190c7c0aafd5 this.setPvpAllowed(dedicatedserverproperties.pvp); this.setFlightAllowed(dedicatedserverproperties.allowFlight); diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 9bb61ea359693f69a570f60be30f8b9b59ab0d19..00bd9c816a62791e892724ebfca08f3cce3645ff 100644 +index 24eab3c684bdd0a07008888d84a037b7d2c8bf7d..e395652b99bbee087604f88a23168206ba874e0c 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -2455,8 +2455,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially +@@ -2454,8 +2454,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance); } @@ -1726,7 +1726,7 @@ index 9bb61ea359693f69a570f60be30f8b9b59ab0d19..00bd9c816a62791e892724ebfca08f3c Iterator iterator = this.entity.getIndirectPassengers().iterator(); while (iterator.hasNext()) { -@@ -2468,6 +2488,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially +@@ -2467,6 +2487,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially i = j; } } @@ -1769,7 +1769,7 @@ index b7c9294fdd3d799d410afba4a1118aa371c98533..c71bc00973899feec0ec5530bf3d2379 this.wasOnGround = this.entity.isOnGround(); this.teleportDelay = 0; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index f40ac8dbd1193410c5fe164a0952f2394e111248..2db8a773c035a74ceb6cd31311b1b0e053775434 100644 +index 33cdd12d15637cf6811dd4a4999baedaf0da7389..74efc7798c781ef3c4e95410a7666bbed838bad1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -775,7 +775,20 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -2012,18 +2012,18 @@ index cfe6921b8da87c5dd09772988fb8e4e0da541cd9..d898b5c55f7659a344259cc0d5bc4abf } } diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index ac99265aacd4a28490705e3079ed04023fb1c54a..96b881fcb4c3871b2fc00080afc19900b28633f5 100644 +index 1c446dba5de89698397041ee38a2e1a00bec8a56..b896c320c94888813567c1733fcbb5974c889302 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java -@@ -298,6 +298,8 @@ public class EntityType implements EntityTypeTest { - +@@ -297,6 +297,8 @@ public class EntityType implements EntityTypeTest { + // Paper start - add id public final String id; + public boolean dabEnabled = false; // Airplane + - public EntityType(EntityType.EntityFactory entitytypes_b, MobCategory enumcreaturetype, boolean flag, boolean flag1, boolean flag2, boolean flag3, ImmutableSet canSpawnInside, EntityDimensions dimensions, int maxTrackDistance, int trackTickInterval, String id) { // Paper - add id - this.factory = entitytypes_b; - this.category = enumcreaturetype; + public EntityType(EntityType.EntityFactory factory, MobCategory spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnInside, EntityDimensions dimensions, int maxTrackDistance, int trackTickInterval) { + this(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnInside, dimensions, maxTrackDistance, trackTickInterval, "custom"); + } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index 6175360eb2b19c8197cc5b82a09030211afd838b..f0ce1e4364e1a549163c8a3a714fb20df42ae3c3 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3139,10 +3139,10 @@ index c9e942669458668a184aaec3bc0a5509dd6ab5f0..178e56ffc87ea2beb4d84d1f278f4acf for(int j = 0; j < 4096; ++j) { T object2 = this.get(j); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index 4ec0cd61c860a90bbe44244bb3f6b628c4533c98..6b870d5d45a668e52eec639e149b43722489dab0 100644 +index 7921ee2786d0d6a60d43786b20efc03a0f9178e3..9ea4229f58679c6c833762fc6a50471445ff0b9d 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -@@ -502,6 +502,7 @@ public class ChunkSerializer { +@@ -500,6 +500,7 @@ public class ChunkSerializer { return new AsyncSaveData(blockLight, skyLight, blockTickListSerialized, fluidTickListSerialized, blockEntitiesSerialized, world.getGameTime()); } @@ -3150,7 +3150,7 @@ index 4ec0cd61c860a90bbe44244bb3f6b628c4533c98..6b870d5d45a668e52eec639e149b4372 public static CompoundTag write(ServerLevel world, ChunkAccess chunk) { return saveChunk(world, chunk, null); } -@@ -535,6 +536,7 @@ public class ChunkSerializer { +@@ -533,6 +534,7 @@ public class ChunkSerializer { ThreadedLevelLightEngine lightenginethreaded = world.getChunkSource().getLightEngine(); boolean flag = chunk.isLightCorrect(); @@ -3158,7 +3158,7 @@ index 4ec0cd61c860a90bbe44244bb3f6b628c4533c98..6b870d5d45a668e52eec639e149b4372 for (int i = lightenginethreaded.getMinLightSection(); i < lightenginethreaded.getMaxLightSection(); ++i) { int finalI = i; // CraftBukkit - decompile errors LevelChunkSection chunksection = (LevelChunkSection) Arrays.stream(achunksection).filter((chunksection1) -> { -@@ -549,7 +551,7 @@ public class ChunkSerializer { +@@ -547,7 +549,7 @@ public class ChunkSerializer { nbttagcompound2.putByte("Y", (byte) (i & 255)); if (chunksection != LevelChunk.EMPTY_SECTION) { diff --git a/patches/server/0019-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0019-PlayerSetSpawnerTypeWithEggEvent.patch index 7e765ba23..76a5afb8c 100644 --- a/patches/server/0019-PlayerSetSpawnerTypeWithEggEvent.patch +++ b/patches/server/0019-PlayerSetSpawnerTypeWithEggEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index 96b881fcb4c3871b2fc00080afc19900b28633f5..0811cc816ce8d72a35643b7a9c1d8b23cbfdab00 100644 +index b896c320c94888813567c1733fcbb5974c889302..7255d31a629992807589faeb389f0f18f673c976 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java @@ -286,6 +286,16 @@ public class EntityType implements EntityTypeTest { @@ -25,7 +25,7 @@ index 96b881fcb4c3871b2fc00080afc19900b28633f5..0811cc816ce8d72a35643b7a9c1d8b23 public static ResourceLocation getKey(EntityType type) { return Registry.ENTITY_TYPE.getKey(type); } -@@ -452,6 +462,16 @@ public class EntityType implements EntityTypeTest { +@@ -455,6 +465,16 @@ public class EntityType implements EntityTypeTest { return this.category; } diff --git a/patches/server/0020-EMC-MonsterEggSpawnEvent.patch b/patches/server/0020-EMC-MonsterEggSpawnEvent.patch index b4c089cd8..12ecefeea 100644 --- a/patches/server/0020-EMC-MonsterEggSpawnEvent.patch +++ b/patches/server/0020-EMC-MonsterEggSpawnEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] EMC - MonsterEggSpawnEvent diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index 0811cc816ce8d72a35643b7a9c1d8b23cbfdab00..2b356fed99df2bd15ba2fc6963df7c219b6f0e07 100644 +index 7255d31a629992807589faeb389f0f18f673c976..20094345f90dba666902a8694035b47e0606e02c 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java -@@ -333,13 +333,20 @@ public class EntityType implements EntityTypeTest { +@@ -336,13 +336,20 @@ public class EntityType implements EntityTypeTest { @Nullable public Entity spawn(ServerLevel world, @Nullable ItemStack stack, @Nullable Player player, BlockPos pos, MobSpawnType spawnReason, boolean alignPosition, boolean invertY) { @@ -31,7 +31,7 @@ index 0811cc816ce8d72a35643b7a9c1d8b23cbfdab00..2b356fed99df2bd15ba2fc6963df7c21 } @Nullable -@@ -364,9 +371,29 @@ public class EntityType implements EntityTypeTest { +@@ -367,9 +374,29 @@ public class EntityType implements EntityTypeTest { } } // Paper end diff --git a/patches/server/0073-Item-entity-immunities.patch b/patches/server/0073-Item-entity-immunities.patch index b6a7cf031..d44631dd3 100644 --- a/patches/server/0073-Item-entity-immunities.patch +++ b/patches/server/0073-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 00bd9c816a62791e892724ebfca08f3cce3645ff..b2eaeb1f36471f9b14a23e54338a2e7168677a80 100644 +index e395652b99bbee087604f88a23168206ba874e0c..aa33000f6431f5c0b5f79a34d7389addf5d20374 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -2325,7 +2325,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially +@@ -2324,7 +2324,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially public class TrackedEntity {