Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

more compile fixes

Browse Source
This commit is contained in:
Jake Potrebic 2023-12-06 10:36:49 -08:00
parent fc727a05cd
commit 916f988912
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
View File

@ -18,10 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@javax.annotation.Nullable @javax.annotation.Nullable
@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
if (spawnedViaMobSpawner) { if (spawnedViaMobSpawner) {
nbt.putBoolean("Paper.FromMobSpawner", true); nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
} }
+ if (fromNetherPortal) { + if (fromNetherPortal) {
+ nbt.putBoolean("Paper.FromNetherPortal", true); + nbttagcompound.putBoolean("Paper.FromNetherPortal", true);
+ } + }
// Paper end // Paper end
return nbttagcompound; return nbttagcompound;

2
patches/server/Entity-fromMobSpawner.patch
View File

@ -22,7 +22,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
+ // Save entity's from mob spawner status + // Save entity's from mob spawner status
+ if (spawnedViaMobSpawner) { + if (spawnedViaMobSpawner) {
+ nbt.putBoolean("Paper.FromMobSpawner", true); + nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
+ } + }
// Paper end // Paper end
return nbttagcompound; return nbttagcompound;

4
patches/server/Entity-getEntitySpawnReason.patch
View File

@ -75,11 +75,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
nbttagcompound.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ())); nbttagcompound.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
} }
+ if (spawnReason != null) { + if (spawnReason != null) {
+ nbt.putString("Paper.SpawnReason", spawnReason.name()); + nbttagcompound.putString("Paper.SpawnReason", spawnReason.name());
+ } + }
// Save entity's from mob spawner status // Save entity's from mob spawner status
if (spawnedViaMobSpawner) { if (spawnedViaMobSpawner) {
nbt.putBoolean("Paper.FromMobSpawner", true); nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
} }

4
patches/server/Freeze-Tick-Lock-API.patch
View File

@ -27,10 +27,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
if (fromNetherPortal) { if (fromNetherPortal) {
nbt.putBoolean("Paper.FromNetherPortal", true); nbttagcompound.putBoolean("Paper.FromNetherPortal", true);
} }
+ if (freezeLocked) { + if (freezeLocked) {
+ nbt.putBoolean("Paper.FreezeLock", true); + nbttagcompound.putBoolean("Paper.FreezeLock", true);
+ } + }
// Paper end // Paper end
return nbttagcompound; return nbttagcompound;

6
patches/server/Timings-v2.patch
View File

@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+import com.google.common.collect.MapMaker; +import com.google.common.collect.MapMaker;
+import io.papermc.paper.configuration.GlobalConfiguration; +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.network.protocol.Packet;
+import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntity;
@ -159,8 +159,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return Timings.ofSafe("## Packet - " + packet.getClass().getName(), packetProcessTimer); + return Timings.ofSafe("## Packet - " + packet.getClass().getName(), packetProcessTimer);
+ } + }
+ +
+ public static Timing getCommandFunctionTiming(CommandFunction function) { + public static Timing getCommandFunctionTiming(CommandFunction<?> function) {
+ return Timings.ofSafe("Command Function - " + function.getId()); + return Timings.ofSafe("Command Function - " + function.id());
+ } + }
+ +
+ public static void processConfig(GlobalConfiguration.Timings config) { + public static void processConfig(GlobalConfiguration.Timings config) {