From deb02722b271f46fa7e40df58dec0487a9323711 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Wed, 6 Dec 2023 10:36:49 -0800 Subject: [PATCH] more compile fixes --- patches/server/0014-Timings-v2.patch | 8 ++++---- patches/server/0144-Entity-fromMobSpawner.patch | 4 ++-- patches/server/0299-Entity-getEntitySpawnReason.patch | 6 +++--- ...49-Add-option-to-nerf-pigmen-from-nether-portals.patch | 6 +++--- patches/server/0754-Freeze-Tick-Lock-API.patch | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch index ebb27f1598..b6b43d7b5f 100644 --- a/patches/server/0014-Timings-v2.patch +++ b/patches/server/0014-Timings-v2.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java new file mode 100644 -index 0000000000000000000000000000000000000000..59affb62cb487d60e8c3e32decf89d6cb7d22f8d +index 0000000000000000000000000000000000000000..4bd813161a5d76a83cdbd0a9209b9ea9e60ffe1b --- /dev/null +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -0,0 +1,169 @@ @@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..59affb62cb487d60e8c3e32decf89d6c + +import com.google.common.collect.MapMaker; +import io.papermc.paper.configuration.GlobalConfiguration; -+import net.minecraft.commands.CommandFunction; ++import net.minecraft.commands.functions.CommandFunction; +import net.minecraft.network.protocol.Packet; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntity; @@ -159,8 +159,8 @@ index 0000000000000000000000000000000000000000..59affb62cb487d60e8c3e32decf89d6c + return Timings.ofSafe("## Packet - " + packet.getClass().getName(), packetProcessTimer); + } + -+ public static Timing getCommandFunctionTiming(CommandFunction function) { -+ return Timings.ofSafe("Command Function - " + function.getId()); ++ public static Timing getCommandFunctionTiming(CommandFunction function) { ++ return Timings.ofSafe("Command Function - " + function.id()); + } + + public static void processConfig(GlobalConfiguration.Timings config) { diff --git a/patches/server/0144-Entity-fromMobSpawner.patch b/patches/server/0144-Entity-fromMobSpawner.patch index 4739889fa4..98dbdfb6f9 100644 --- a/patches/server/0144-Entity-fromMobSpawner.patch +++ b/patches/server/0144-Entity-fromMobSpawner.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ffd38defdd9b56b1849a3b4e312de2cff7b964c2..ba96a1c657d4e81076536d0d6432e4d6584bda2c 100644 +index ffd38defdd9b56b1849a3b4e312de2cff7b964c2..451ba2db54dc1682924fa65283bc88687157322e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -393,6 +393,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -22,7 +22,7 @@ index ffd38defdd9b56b1849a3b4e312de2cff7b964c2..ba96a1c657d4e81076536d0d6432e4d6 } + // Save entity's from mob spawner status + if (spawnedViaMobSpawner) { -+ nbt.putBoolean("Paper.FromMobSpawner", true); ++ nbttagcompound.putBoolean("Paper.FromMobSpawner", true); + } // Paper end return nbttagcompound; diff --git a/patches/server/0299-Entity-getEntitySpawnReason.patch b/patches/server/0299-Entity-getEntitySpawnReason.patch index 91b8724130..fa813b7589 100644 --- a/patches/server/0299-Entity-getEntitySpawnReason.patch +++ b/patches/server/0299-Entity-getEntitySpawnReason.patch @@ -59,7 +59,7 @@ index 59fcb123cb1a49cca4072a62aa304e7382a07ccb..f7e0364b4f5cf73d36f26ad169c93259 }); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 760bb3bfa47ee1e4c6a6add7ab823a24ffd9e15e..75effaa34f06d85ee4e26d9a598acc85c94e9767 100644 +index fa24d236ed330b417306f137d441bb08dc79a3f5..5397d84d790c32d369b0726db16571348285d8fb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -235,6 +235,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -75,11 +75,11 @@ index 760bb3bfa47ee1e4c6a6add7ab823a24ffd9e15e..75effaa34f06d85ee4e26d9a598acc85 nbttagcompound.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ())); } + if (spawnReason != null) { -+ nbt.putString("Paper.SpawnReason", spawnReason.name()); ++ nbttagcompound.putString("Paper.SpawnReason", spawnReason.name()); + } // Save entity's from mob spawner status if (spawnedViaMobSpawner) { - nbt.putBoolean("Paper.FromMobSpawner", true); + nbttagcompound.putBoolean("Paper.FromMobSpawner", true); @@ -2358,6 +2362,26 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S } diff --git a/patches/server/0349-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0349-Add-option-to-nerf-pigmen-from-nether-portals.patch index ccf77613b9..35816f0167 100644 --- a/patches/server/0349-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/patches/server/0349-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2e6b700b3648d716f63dca46019f425d2919e912..aba3e8e8873ef9b782382b09c6f5e243744c18b8 100644 +index cf3742d3d771f6e0c71917bafda7027bd69b1aff..32558b5acfbc13f969d6d5c4e9a61d0beca6c41b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -397,6 +397,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -18,10 +18,10 @@ index 2e6b700b3648d716f63dca46019f425d2919e912..aba3e8e8873ef9b782382b09c6f5e243 @javax.annotation.Nullable @@ -2231,6 +2232,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S if (spawnedViaMobSpawner) { - nbt.putBoolean("Paper.FromMobSpawner", true); + nbttagcompound.putBoolean("Paper.FromMobSpawner", true); } + if (fromNetherPortal) { -+ nbt.putBoolean("Paper.FromNetherPortal", true); ++ nbttagcompound.putBoolean("Paper.FromNetherPortal", true); + } // Paper end return nbttagcompound; diff --git a/patches/server/0754-Freeze-Tick-Lock-API.patch b/patches/server/0754-Freeze-Tick-Lock-API.patch index 55d03791bf..50457eeeaa 100644 --- a/patches/server/0754-Freeze-Tick-Lock-API.patch +++ b/patches/server/0754-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 92b2e09ff556b1aad835f5e8e67e9af324ed964a..8f3b6cbe715e30922191444833584ed17439b518 100644 +index 584a254d1a5222d404f5bc8062830cb82c228a66..8f178446ee632ae2aad735cae2edf6db96250f43 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -407,6 +407,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -27,10 +27,10 @@ index 92b2e09ff556b1aad835f5e8e67e9af324ed964a..8f3b6cbe715e30922191444833584ed1 } @@ -2456,6 +2457,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S if (fromNetherPortal) { - nbt.putBoolean("Paper.FromNetherPortal", true); + nbttagcompound.putBoolean("Paper.FromNetherPortal", true); } + if (freezeLocked) { -+ nbt.putBoolean("Paper.FreezeLock", true); ++ nbttagcompound.putBoolean("Paper.FreezeLock", true); + } // Paper end return nbttagcompound;