diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerLevel.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch similarity index 86% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerLevel.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch index 0bfb3f56c..34fb37fd2 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerLevel.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch @@ -1,23 +1,15 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a2900104a396e2e 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -206,6 +206,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -212,6 +_,8 @@ private final StructureManager structureManager; private final StructureCheck structureCheck; private final boolean tickTime; + private double preciseTime; // Purpur - Configurable daylight cycle + private boolean forceTime; // Purpur - Configurable daylight cycle private final RandomSequences randomSequences; + final LevelDebugSynchronizers debugSynchronizers = new LevelDebugSynchronizers(this); - // CraftBukkit start -@@ -590,7 +592,24 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -609,7 +_,24 @@ // CraftBukkit end this.tickTime = tickTime; this.server = server; @@ -40,10 +32,10 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010 + this.customSpawners.add(new net.minecraft.world.entity.npc.WanderingTraderSpawner(serverLevelData)); + } + // Purpur end - Allow toggling special MobSpawners per world - this.serverLevelData = serverLevelData; + this.serverLevelData = levelData; ChunkGenerator chunkGenerator = levelStem.generator(); // CraftBukkit start -@@ -675,6 +694,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -692,6 +_,7 @@ this.chunkDataController = new ca.spottedleaf.moonrise.patches.chunk_system.io.datacontroller.ChunkDataController((ServerLevel)(Object)this, this.chunkTaskScheduler); // Paper end - rewrite chunk system this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit @@ -51,7 +43,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010 } // Paper start -@@ -721,7 +741,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -738,7 +_,7 @@ } int _int = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE); @@ -60,7 +52,15 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010 // Paper start - create time skip event - move up calculations final long newDayTime = this.levelData.getDayTime() + 24000L; org.bukkit.event.world.TimeSkipEvent event = new org.bukkit.event.world.TimeSkipEvent( -@@ -840,6 +860,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -855,6 +_,7 @@ + this.debugSynchronizers.tick(this.server.debugSubscribers()); + profilerFiller.pop(); + } ++ // Purpur end - Configurable daylight cycle + + @Override + public boolean shouldTickBlocksAt(long chunkPos) { +@@ -872,6 +_,13 @@ this.serverLevelData.getScheduledEvents().tick(this.server, l); Profiler.get().pop(); if (this.serverLevelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) { @@ -74,7 +74,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010 this.setDayTime(this.levelData.getDayTime() + 1L); } } -@@ -847,7 +874,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -879,6 +_,19 @@ public void setDayTime(long time) { this.serverLevelData.setDayTime(time); @@ -92,13 +92,11 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010 + public boolean isForceTime() { + return this.forceTime; } -+ // Purpur end - Configurable daylight cycle - public void tickCustomSpawners(boolean spawnEnemies, boolean spawnFriendlies) { - for (CustomSpawner customSpawner : this.customSpawners) { -@@ -951,9 +992,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe + public void tickCustomSpawners(boolean flag) { +@@ -983,9 +_,17 @@ && this.random.nextDouble() < currentDifficultyAt.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01) // Paper - Configurable spawn chances for skeleton horses - && !this.getBlockState(blockPos.below()).is(Blocks.LIGHTNING_ROD); + && !this.getBlockState(blockPos.below()).is(BlockTags.LIGHTNING_RODS); if (flag) { - SkeletonHorse skeletonHorse = EntityType.SKELETON_HORSE.create(this, EntitySpawnReason.EVENT); + // Purpur start - Special mobs naturally spawn @@ -116,7 +114,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010 skeletonHorse.setAge(0); skeletonHorse.setPos(blockPos.getX(), blockPos.getY(), blockPos.getZ()); this.addFreshEntity(skeletonHorse, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit -@@ -988,9 +1037,35 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1020,9 +_,35 @@ if (blockState.is(Blocks.SNOW)) { int layersValue = blockState.getValue(SnowLayerBlock.LAYERS); if (layersValue < Math.min(_int, 8)) { @@ -152,8 +150,8 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010 } } else { org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, Blocks.SNOW.defaultBlockState(), 3, null); // CraftBukkit -@@ -1011,7 +1086,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe - pointOfInterestType -> pointOfInterestType.is(PoiTypes.LIGHTNING_ROD), +@@ -1043,7 +_,7 @@ + holder -> holder.is(PoiTypes.LIGHTNING_ROD), blockPos -> blockPos.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockPos.getX(), blockPos.getZ()) - 1, pos, - 128, @@ -161,7 +159,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010 PoiManager.Occupancy.ANY ); return optional.map(blockPos -> blockPos.above(1)); -@@ -1060,8 +1135,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1092,8 +_,26 @@ int _int = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE); Component component; if (this.sleepStatus.areEnoughSleeping(_int)) { @@ -188,7 +186,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010 component = Component.translatable("sleep.players_sleeping", this.sleepStatus.amountSleeping(), this.sleepStatus.sleepersNeeded(_int)); } -@@ -1198,6 +1291,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1230,6 +_,7 @@ @VisibleForTesting public void resetWeatherCycle() { // CraftBukkit start @@ -196,7 +194,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010 this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents // If we stop due to everyone sleeping we should reset the weather duration to some other random value. // Not that everyone ever manages to get the whole server to sleep at the same time.... -@@ -1205,6 +1299,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1237,6 +_,7 @@ this.serverLevelData.setRainTime(0); } // CraftBukkit end @@ -204,7 +202,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010 this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents // CraftBukkit start // If we stop due to everyone sleeping we should reset the weather duration to some other random value. -@@ -2727,7 +2822,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2793,7 +_,7 @@ // Spigot start if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message // Paper start - Fix merchant inventory not closing on entity removal diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerPlayer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch similarity index 87% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerPlayer.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch index 0d48fe63b..7b4fdeb4b 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerPlayer.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba0f12523a 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -429,6 +429,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -442,6 +_,9 @@ public boolean isRealPlayer; // Paper public @Nullable com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent public @Nullable org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event @@ -18,20 +10,19 @@ index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba // Paper start - rewrite chunk system private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader; -@@ -562,6 +565,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -515,6 +_,9 @@ this.respawnConfig = input.read("respawn", ServerPlayer.RespawnConfig.CODEC).orElse(null); this.spawnExtraParticlesOnFall = input.getBooleanOr("spawn_extra_particles_on_fall", false); this.raidOmenPosition = input.read("raid_omen_position", BlockPos.CODEC).orElse(null); -+ + this.tpsBar = input.getBooleanOr("Purpur.TPSBar", false); // Purpur - Implement TPSBar + this.compassBar = input.getBooleanOr("Purpur.CompassBar", false); // Purpur - Add compass command + this.ramBar = input.getBooleanOr("Purpur.RamBar", false); // Purpur - Implement rambar command + // Paper start - Expand PlayerGameModeChangeEvent + this.loadGameTypes(input); } - - @Override -@@ -579,6 +586,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc - output.storeNullable("raid_omen_position", BlockPos.CODEC, this.raidOmenPosition); - this.saveEnderPearls(output); +@@ -556,6 +_,9 @@ + output.store("ShoulderEntityRight", CompoundTag.CODEC, this.getShoulderEntityRight()); + } this.getBukkitEntity().setExtraData(output); // CraftBukkit + output.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur - Implement TPSBar + output.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur - Add compass command @@ -39,7 +30,7 @@ index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba } private void saveParentVehicle(ValueOutput output) { -@@ -1079,6 +1089,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1185,6 +_,7 @@ // Paper - moved up to sendClientboundPlayerCombatKillPacket() sendClientboundPlayerCombatKillPacket(event.getShowDeathMessages(), deathScreenMessage); // Paper - Expand PlayerDeathEvent Team team = this.getTeam(); @@ -47,7 +38,7 @@ index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba if (team == null || team.getDeathMessageVisibility() == Team.Visibility.ALWAYS) { this.server.getPlayerList().broadcastSystemMessage(deathMessage, false); } else if (team.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) { -@@ -1185,6 +1196,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1292,6 +_,13 @@ if (this.isInvulnerableTo(level, damageSource)) { return false; } else { @@ -61,7 +52,7 @@ index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba Entity entity = damageSource.getEntity(); if (!( // Paper - split the if statement. If below statement is false, hurtServer would not have been evaluated. Return false. !(entity instanceof Player player && !this.canHarmPlayer(player)) -@@ -1438,6 +1456,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1549,6 +_,7 @@ serverLevel.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION); this.unsetRemoved(); // CraftBukkit end @@ -69,7 +60,7 @@ index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba this.setServerLevel(level); this.connection.internalTeleport(PositionMoveRotation.of(teleportTransition), teleportTransition.relatives()); // CraftBukkit - use internal teleport without event this.connection.resetPosition(); -@@ -1554,7 +1573,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1668,7 +_,7 @@ new AABB(vec3.x() - 8.0, vec3.y() - 5.0, vec3.z() - 8.0, vec3.x() + 8.0, vec3.y() + 5.0, vec3.z() + 8.0), monster -> monster.isPreventingPlayerRest(this.level(), this) ); @@ -78,7 +69,7 @@ index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba return Either.left(Player.BedSleepingProblem.NOT_SAFE); } } -@@ -1591,7 +1610,19 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1705,7 +_,19 @@ CriteriaTriggers.SLEPT_IN_BED.trigger(this); }); if (!this.level().canSleepThroughNights()) { @@ -99,7 +90,7 @@ index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba } this.level().updateSleepingPlayerList(); -@@ -1683,6 +1714,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1797,6 +_,7 @@ @Override public void openTextEdit(SignBlockEntity signEntity, boolean isFrontText) { @@ -107,7 +98,7 @@ index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba this.connection.send(new ClientboundBlockUpdatePacket(this.level(), signEntity.getBlockPos())); this.connection.send(new ClientboundOpenSignEditorPacket(signEntity.getBlockPos(), isFrontText)); } -@@ -1992,6 +2024,26 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -2106,6 +_,26 @@ this.lastSentExp = -1; // CraftBukkit - Added to reset } @@ -134,7 +125,7 @@ index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba @Override public void displayClientMessage(Component chatComponent, boolean actionBar) { this.sendSystemMessage(chatComponent, actionBar); -@@ -2210,6 +2262,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -2325,6 +_,20 @@ ); } @@ -155,13 +146,14 @@ index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba public void sendSystemMessage(Component mesage) { this.sendSystemMessage(mesage, false); } -@@ -2348,8 +2414,68 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -2463,7 +_,67 @@ public void resetLastActionTime() { this.lastActionTime = Util.getMillis(); +- } + this.setAfk(false); // Purpur - AFK API - } - ++ } ++ + // Purpur start - AFK API + private boolean isAfk = false; + @@ -220,11 +212,10 @@ index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba + return !this.isAfk() && super.canBeCollidedWith(entity); + } + // Purpur end - AFK API -+ + public ServerStatsCounter getStats() { return this.stats; - } -@@ -2976,4 +3102,56 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -3105,4 +_,56 @@ return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch similarity index 83% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch index 918f919bb..917904c00 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index f02800e4e941b05bde6f0d5fac76e2b6ec5b9832..436f753d00f3854c481c95e4ddacfd9fac9932d4 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -@@ -39,10 +39,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -40,10 +_,11 @@ public final Connection connection; // Paper private final boolean transferred; //private long keepAliveTime; // Paper - improve keepalives @@ -21,7 +13,7 @@ index f02800e4e941b05bde6f0d5fac76e2b6ec5b9832..436f753d00f3854c481c95e4ddacfd9f private volatile int latency; // Paper - improve keepalives - make volatile private final io.papermc.paper.util.KeepAlive keepAlive; // Paper - improve keepalives private volatile boolean suspendFlushingOnServerThread = false; -@@ -53,6 +54,10 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -54,6 +_,10 @@ public final java.util.Map packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit protected static final net.minecraft.resources.ResourceLocation MINECRAFT_BRAND = net.minecraft.resources.ResourceLocation.withDefaultNamespace("brand"); // Paper - Brand support @@ -32,7 +24,7 @@ index f02800e4e941b05bde6f0d5fac76e2b6ec5b9832..436f753d00f3854c481c95e4ddacfd9f // Paper start - retain certain values public @Nullable String playerBrand; public final java.util.Set pluginMessagerChannels; -@@ -104,6 +109,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -105,6 +_,18 @@ // Paper start - improve keepalives long now = System.nanoTime(); io.papermc.paper.util.KeepAlive.PendingKeepAlive pending = this.keepAlive.pendingKeepAlives.peek(); @@ -51,7 +43,7 @@ index f02800e4e941b05bde6f0d5fac76e2b6ec5b9832..436f753d00f3854c481c95e4ddacfd9f if (pending != null && pending.challengeId() == packet.getId()) { this.keepAlive.pendingKeepAlives.remove(pending); -@@ -178,6 +195,12 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -179,6 +_,12 @@ return; } @@ -64,7 +56,7 @@ index f02800e4e941b05bde6f0d5fac76e2b6ec5b9832..436f753d00f3854c481c95e4ddacfd9f if (identifier.equals(MINECRAFT_BRAND)) { this.playerBrand = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.wrappedBuffer(data)).readUtf(256); } -@@ -263,6 +286,23 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -264,6 +_,23 @@ Profiler.get().push("keepAlive"); long millis = Util.getMillis(); // Paper start - improve keepalives diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch similarity index 84% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch index 621515409..927bc8cad 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb4258f787390 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -338,6 +338,20 @@ public class ServerGamePacketListenerImpl +@@ -340,6 +_,20 @@ } // Paper end - configuration phase API @@ -29,20 +21,20 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 @Override public void tick() { if (this.ackBlockChangesUpTo > -1) { -@@ -396,6 +410,12 @@ public class ServerGamePacketListenerImpl - if (this.player.getLastActionTime() > 0L - && this.server.getPlayerIdleTimeout() > 0 - && Util.getMillis() - this.player.getLastActionTime() > this.server.getPlayerIdleTimeout() * 1000L * 60L && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits -+ // Purpur start - AFK API -+ this.player.setAfk(true); -+ if (!this.player.level().purpurConfig.idleTimeoutKick || (!Boolean.parseBoolean(System.getenv("PURPUR_FORCE_IDLE_KICK")) && kickPermissionCache.getUnchecked(this.player.getBukkitEntity()))) { -+ return; -+ } -+ // Purpur end - AFK API - this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854 - this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause +@@ -357,6 +_,12 @@ + && this.server.playerIdleTimeout() > 0 + && Util.getMillis() - this.player.getLastActionTime() > TimeUnit.MINUTES.toMillis(this.server.playerIdleTimeout()) + && !this.player.wonGame) { ++ // Purpur start - AFK API ++ this.player.setAfk(true); ++ if (!this.player.level().purpurConfig.idleTimeoutKick || (!Boolean.parseBoolean(System.getenv("PURPUR_FORCE_IDLE_KICK")) && kickPermissionCache.getUnchecked(this.player.getBukkitEntity()))) { ++ return; ++ } ++ // Purpur end - AFK API + this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause + } } -@@ -665,6 +685,8 @@ public class ServerGamePacketListenerImpl +@@ -671,6 +_,8 @@ this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -51,7 +43,7 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 Location oldTo = to.clone(); PlayerMoveEvent event = new PlayerMoveEvent(player, from, to); this.cserver.getPluginManager().callEvent(event); -@@ -744,6 +766,7 @@ public class ServerGamePacketListenerImpl +@@ -750,6 +_,7 @@ PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level()); if (packet.getId() == this.awaitingTeleport) { if (this.awaitingPositionFromClient == null) { @@ -59,7 +51,7 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause return; } -@@ -1277,6 +1300,10 @@ public class ServerGamePacketListenerImpl +@@ -1283,6 +_,10 @@ final int maxBookPageSize = pageMax.intValue(); final double multiplier = Math.clamp(io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.totalMultiplier, 0.3D, 1D); long byteAllowed = maxBookPageSize; @@ -70,7 +62,7 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 for (final String page : pageList) { final int byteLength = page.getBytes(java.nio.charset.StandardCharsets.UTF_8).length; byteTotal += byteLength; -@@ -1301,7 +1328,8 @@ public class ServerGamePacketListenerImpl +@@ -1307,7 +_,8 @@ } if (byteTotal > byteAllowed) { @@ -80,7 +72,7 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 this.disconnectAsync(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause // Paper - add proper async disconnect return; } -@@ -1320,31 +1348,45 @@ public class ServerGamePacketListenerImpl +@@ -1326,31 +_,45 @@ Optional optional = packet.title(); optional.ifPresent(list::add); list.addAll(packet.pages()); @@ -128,9 +120,9 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 - List> list = pages.stream().map(filteredText -> this.filterableFromOutgoing(filteredText).map(Component::literal)).toList(); + List> list = pages.stream().map((filteredText) -> this.filterableFromOutgoing(filteredText).map(s -> hexColor(s, hasPerm))).toList(); // Purpur - Allow color codes in books itemStack.set( - DataComponents.WRITTEN_BOOK_CONTENT, - new WrittenBookContent(this.filterableFromOutgoing(title), this.player.getName().getString(), 0, list, true) -@@ -1358,6 +1400,16 @@ public class ServerGamePacketListenerImpl + DataComponents.WRITTEN_BOOK_CONTENT, new WrittenBookContent(this.filterableFromOutgoing(title), this.player.getPlainTextName(), 0, list, true) + ); +@@ -1363,6 +_,16 @@ return this.player.isTextFilteringEnabled() ? Filterable.passThrough(filteredText.filteredOrEmpty()) : Filterable.from(filteredText); } @@ -147,7 +139,7 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 @Override public void handleEntityTagQuery(ServerboundEntityTagQueryPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level()); -@@ -1397,7 +1449,15 @@ public class ServerGamePacketListenerImpl +@@ -1402,7 +_,15 @@ @Override public void handleMovePlayer(ServerboundMovePlayerPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level()); @@ -164,16 +156,16 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause } else { ServerLevel serverLevel = this.player.level(); -@@ -1579,7 +1639,7 @@ public class ServerGamePacketListenerImpl +@@ -1584,7 +_,7 @@ movedWrongly = true; if (event.getLogWarning()) // Paper end -- LOGGER.warn("{} moved wrongly!", this.player.getName().getString()); -+ LOGGER.warn("{} moved wrongly!, ({})", this.player.getName().getString(), verticalDelta); // Purpur - AFK API +- LOGGER.warn("{} moved wrongly!", this.player.getPlainTextName()); ++ LOGGER.warn("{} moved wrongly!, ({})", this.player.getPlainTextName(), verticalDelta); // Purpur - AFK API } // Paper } -@@ -1644,6 +1704,8 @@ public class ServerGamePacketListenerImpl +@@ -1649,6 +_,8 @@ this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -182,7 +174,7 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 Location oldTo = to.clone(); PlayerMoveEvent event = new PlayerMoveEvent(player, from, to); this.cserver.getPluginManager().callEvent(event); -@@ -1699,6 +1761,13 @@ public class ServerGamePacketListenerImpl +@@ -1704,6 +_,13 @@ this.player.tryResetCurrentImpulseContext(); } @@ -196,7 +188,7 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 this.player.checkMovementStatistics(this.player.getX() - x, this.player.getY() - y, this.player.getZ() - z); this.lastGoodX = this.player.getX(); this.lastGoodY = this.player.getY(); -@@ -1716,6 +1785,17 @@ public class ServerGamePacketListenerImpl +@@ -1721,6 +_,17 @@ } } @@ -214,7 +206,7 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 private boolean shouldCheckPlayerMovement(boolean isElytraMovement) { if (this.isSingleplayerOwner()) { return false; -@@ -2113,6 +2193,7 @@ public class ServerGamePacketListenerImpl +@@ -2120,6 +_,7 @@ boolean cancelled; if (hitResult == null || hitResult.getType() != HitResult.Type.BLOCK) { @@ -222,7 +214,7 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemInHand, hand); cancelled = event.useItemInHand() == Event.Result.DENY; } else { -@@ -2760,6 +2841,7 @@ public class ServerGamePacketListenerImpl +@@ -2767,6 +_,7 @@ AABB boundingBox = target.getBoundingBox(); if (this.player.canInteractWithEntity(boundingBox, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(3.0))) { // Paper - configurable lenience value for interact range @@ -230,7 +222,7 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 packet.dispatch( new ServerboundInteractPacket.Handler() { private void performInteraction(InteractionHand hand, ServerGamePacketListenerImpl.EntityInteraction entityInteraction, PlayerInteractEntityEvent event) { // CraftBukkit -@@ -3492,7 +3574,7 @@ public class ServerGamePacketListenerImpl +@@ -3502,7 +_,7 @@ @Override public void handleChangeGameMode(ServerboundChangeGameModePacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level()); @@ -238,4 +230,4 @@ index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb425 + if (!this.player.hasPermissions(2) && !player.getBukkitEntity().hasPermission("purpur.debug.f3n")) { // Purpur - Add permission for F3+N debug LOGGER.warn( "Player {} tried to change game mode to {} without required permissions", - this.player.getGameProfile().getName(), + this.player.getGameProfile().name(), diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Entity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch similarity index 79% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Entity.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch index ae530ba1f..eff8ee2eb 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Entity.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch @@ -1,22 +1,14 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c207bd4547 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -148,6 +148,7 @@ import org.jetbrains.annotations.Contract; +@@ -150,6 +_,7 @@ import org.slf4j.Logger; - public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess, ScoreHolder, DataComponentGetter, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity { // Paper - rewrite chunk system // Paper - optimise entity tracker + public abstract class Entity implements SyncedDataHolder, DebugValueSource, Nameable, ItemOwner, EntityAccess, ScoreHolder, DataComponentGetter, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity { // Paper - rewrite chunk system // Paper - optimise entity tracker + public static javax.script.ScriptEngine scriptEngine = new javax.script.ScriptEngineManager().getEngineByName("rhino"); // Purpur - Configurable entity base attributes // CraftBukkit start private static final int CURRENT_LEVEL = 2; public boolean preserveMotion = true; // Paper - Fix Entity Teleportation and cancel velocity if teleported; keep initial motion on first snapTo -@@ -280,8 +281,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -282,8 +_,9 @@ public double xOld; public double yOld; public double zOld; @@ -27,7 +19,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 public int tickCount; private int remainingFireTicks; public boolean wasTouchingWater; -@@ -315,8 +317,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -317,8 +_,8 @@ public PortalProcessor portalProcess; public int portalCooldown; private boolean invulnerable; @@ -38,7 +30,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 private boolean hasGlowingTag; private final Set tags = new io.papermc.paper.util.SizeLimitedSet<>(new it.unimi.dsi.fastutil.objects.ObjectOpenHashSet<>(), MAX_ENTITY_TAG_COUNT); // Paper - fully limit tag size - replace set impl private final double[] pistonDeltas = new double[]{0.0, 0.0, 0.0}; -@@ -371,6 +373,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -373,6 +_,7 @@ public long activatedTick = Integer.MIN_VALUE; public boolean isTemporarilyActive; public long activatedImmunityTick = Integer.MIN_VALUE; @@ -46,7 +38,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 public void inactiveTick() { } -@@ -533,10 +536,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -535,10 +_,21 @@ } // Paper end - optimise entity tracker @@ -68,7 +60,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 this.position = Vec3.ZERO; this.blockPosition = BlockPos.ZERO; this.chunkPosition = ChunkPos.ZERO; -@@ -911,6 +925,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -917,6 +_,7 @@ && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v) && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) { // Paper end - Configurable nether ceiling damage @@ -76,7 +68,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 this.onBelowWorld(); } } -@@ -1889,7 +1904,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1937,7 +_,7 @@ } public boolean fireImmune() { @@ -85,7 +77,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 } public boolean causeFallDamage(double fallDistance, float damageMultiplier, DamageSource damageSource) { -@@ -2585,6 +2600,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2637,6 +_,11 @@ output.putBoolean("Paper.FreezeLock", true); } // Paper end @@ -97,7 +89,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 } catch (Throwable var7) { CrashReport crashReport = CrashReport.forThrowable(var7, "Saving entity NBT"); CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being saved"); -@@ -2705,6 +2725,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2757,6 +_,9 @@ } freezeLocked = input.getBooleanOr("Paper.FreezeLock", false); // Paper end @@ -107,7 +99,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 } catch (Throwable var7) { CrashReport crashReport = CrashReport.forThrowable(var7, "Loading entity NBT"); CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being loaded"); -@@ -2983,6 +3006,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3030,6 +_,7 @@ if (this.isAlive() && this instanceof Leashable leashable2) { if (leashable2.getLeashHolder() == player) { if (!this.level().isClientSide()) { @@ -115,7 +107,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 // Paper start - EntityUnleashEvent if (!org.bukkit.craftbukkit.event.CraftEventFactory.handlePlayerUnleashEntityEvent( leashable2, player, hand, !player.hasInfiniteMaterials(), true -@@ -3388,15 +3412,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3454,15 +_,18 @@ return Vec3.directionFromRotation(this.getRotationVector()); } @@ -135,7 +127,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 } } } -@@ -3601,7 +3628,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3667,7 +_,7 @@ } public int getMaxAirSupply() { @@ -144,7 +136,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 } public int getAirSupply() { -@@ -4155,7 +4182,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4229,7 +_,7 @@ // CraftBukkit end public boolean canUsePortal(boolean allowPassengers) { @@ -153,7 +145,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 } public boolean canTeleport(Level fromLevel, Level toLevel) { -@@ -4680,6 +4707,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4744,6 +_,12 @@ return Mth.lerp(partialTick, this.yRotO, this.yRot); } @@ -166,7 +158,7 @@ index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c2 // Paper start - optimise collisions public boolean updateFluidHeightAndDoFluidPushing(final TagKey fluid, final double flowScale) { if (this.touchingUnloadedChunk()) { -@@ -5106,7 +5139,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -5171,7 +_,7 @@ } public float maxUpStep() { diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/LivingEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch similarity index 81% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/LivingEntity.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch index 36a0f9dca..174f1af58 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/LivingEntity.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3585aefab 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java -@@ -444,6 +444,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -447,6 +_,12 @@ if (d < 0.0) { double damagePerBlock = serverLevel1.getWorldBorder().getDamagePerBlock(); if (damagePerBlock > 0.0) { @@ -21,12 +13,8 @@ index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3 this.hurtServer(serverLevel1, this.damageSources().outOfBorder(), Math.max(1, Mth.floor(-d * damagePerBlock))); } } -@@ -456,10 +462,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin - && (!flag || !((Player)this).getAbilities().invulnerable); - if (flag1) { - this.setAirSupply(this.decreaseAirSupply(this.getAirSupply())); -- if (this.getAirSupply() == -20) { -+ if (this.getAirSupply() == -this.level().purpurConfig.drowningDamageInterval) { // Purpur - Drowning Settings +@@ -462,7 +_,7 @@ + if (this.shouldTakeDrowningDamage()) { this.setAirSupply(0); serverLevel1.broadcastEntityEvent(this, (byte)67); - this.hurtServer(serverLevel1, this.damageSources().drown(), 2.0F); @@ -34,7 +22,16 @@ index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3 } } else if (this.getAirSupply() < this.getMaxAirSupply()) { this.setAirSupply(this.increaseAirSupply(this.getAirSupply())); -@@ -1039,15 +1045,33 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -522,7 +_,7 @@ + } + + protected boolean shouldTakeDrowningDamage() { +- return this.getAirSupply() <= -20; ++ return this.getAirSupply() <= -this.level().purpurConfig.drowningDamageInterval; // Purpur - Drowning Settings + } + + @Override +@@ -1046,14 +_,32 @@ if (lookingEntity != null) { ItemStack itemBySlot = this.getItemBySlot(EquipmentSlot.HEAD); EntityType type = lookingEntity.getType(); @@ -44,13 +41,15 @@ index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3 - || type == EntityType.PIGLIN_BRUTE && itemBySlot.is(Items.PIGLIN_HEAD) - || type == EntityType.CREEPER && itemBySlot.is(Items.CREEPER_HEAD)) { - d *= 0.5; +- } +- } + // Purpur start - Mob head visibility percent + if (type == EntityType.SKELETON && itemBySlot.is(Items.SKELETON_SKULL)) { + d *= lookingEntity.level().purpurConfig.skeletonHeadVisibilityPercent; + } + else if (type == EntityType.ZOMBIE && itemBySlot.is(Items.ZOMBIE_HEAD)) { + d *= lookingEntity.level().purpurConfig.zombieHeadVisibilityPercent; - } ++ } + else if ((type == EntityType.PIGLIN || type == EntityType.PIGLIN_BRUTE) && itemBySlot.is(Items.PIGLIN_HEAD)) { + d *= lookingEntity.level().purpurConfig.piglinHeadVisibilityPercent; + } @@ -58,8 +57,8 @@ index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3 + d *= lookingEntity.level().purpurConfig.creeperHeadVisibilityPercent; + } + // Purpur end - Mob head visibility percent - } - ++ } ++ + // Purpur start - Configurable mob blindness + if (lookingEntity instanceof LivingEntity entityliving) { + if (entityliving.hasEffect(MobEffects.BLINDNESS)) { @@ -70,11 +69,10 @@ index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3 + } + } + // Purpur end - Configurable mob blindness -+ + return d; } - -@@ -1093,6 +1117,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -1100,6 +_,7 @@ Iterator iterator = this.activeEffects.values().iterator(); while (iterator.hasNext()) { MobEffectInstance effect = iterator.next(); @@ -82,7 +80,7 @@ index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3 EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause, EntityPotionEffectEvent.Action.CLEARED); if (event.isCancelled()) { continue; -@@ -1417,6 +1442,24 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -1424,6 +_,24 @@ this.stopSleeping(); } @@ -107,7 +105,7 @@ index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3 this.noActionTime = 0; if (amount < 0.0F) { amount = 0.0F; -@@ -1678,10 +1721,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -1686,10 +_,10 @@ protected Player resolvePlayerResponsibleForDamage(DamageSource damageSource) { Entity entity = damageSource.getEntity(); if (entity instanceof Player player) { @@ -120,7 +118,7 @@ index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3 } else { this.lastHurtByPlayer = null; this.lastHurtByPlayerMemoryTime = 0; -@@ -1732,6 +1775,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -1740,6 +_,18 @@ } } @@ -139,15 +137,15 @@ index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3 final org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null; final EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot); event.setCancelled(itemStack == null); -@@ -1907,6 +1962,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -1915,6 +_,7 @@ boolean flag = this.lastHurtByPlayerMemoryTime > 0; this.dropEquipment(level); // CraftBukkit - from below - if (this.shouldDropLoot() && level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { + if (this.shouldDropLoot(level)) { + if (!(damageSource.is(net.minecraft.world.damagesource.DamageTypes.CRAMMING) && level().purpurConfig.disableDropsOnCrammingDeath)) { // Purpur - Disable loot drops on death by cramming this.dropFromLootTable(level, damageSource, flag); // Paper start final boolean prev = this.clearEquipmentSlots; -@@ -1915,6 +1971,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -1923,6 +_,7 @@ // Paper end this.dropCustomDeathLoot(level, damageSource, flag); this.clearEquipmentSlots = prev; // Paper @@ -155,7 +153,7 @@ index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3 } // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment -@@ -3109,6 +3166,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -3141,6 +_,7 @@ float f = (float)(d * 10.0 - 3.0); if (f > 0.0F) { this.playSound(this.getFallDamageSound((int)f), 1.0F, 1.0F); @@ -163,16 +161,16 @@ index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3 this.hurt(this.damageSources().flyIntoWall(), f); } } -@@ -4518,6 +4576,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -4540,6 +_,12 @@ + ? slot == EquipmentSlot.MAINHAND && this.canUseSlot(EquipmentSlot.MAINHAND) : slot == equippable.slot() && this.canUseSlot(equippable.slot()) && equippable.canBeEquippedBy(this.getType()); } - ++ + // Purpur start - Dispenser curse of binding protection + public @Nullable EquipmentSlot getEquipmentSlotForDispenserItem(ItemStack itemstack) { + return EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.BINDING_CURSE, itemstack) > 0 ? null : this.getEquipmentSlotForItem(itemstack); + } + // Purpur end - Dispenser curse of binding protection -+ + private static SlotAccess createEquipmentSlotAccess(LivingEntity entity, EquipmentSlot slot) { return slot != EquipmentSlot.HEAD && slot != EquipmentSlot.MAINHAND && slot != EquipmentSlot.OFFHAND - ? SlotAccess.forEquipmentSlot(entity, slot, itemStack -> itemStack.isEmpty() || entity.getEquipmentSlotForItem(itemStack) == slot) diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Mob.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch similarity index 67% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Mob.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch index 7943f7547..dd8776b00 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Mob.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index e0b3cb2b2694768803ed347a1026b881fd624951..150d12e27c2de0740af5c554286358f81e290fae 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java -@@ -140,6 +140,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -150,6 +_,7 @@ private int homeRadius = -1; public boolean aware = true; // CraftBukkit public net.kyori.adventure.util.TriState despawnInPeacefulOverride = net.kyori.adventure.util.TriState.NOT_SET; // Paper - allow changing despawnInPeaceful @@ -16,7 +8,7 @@ index e0b3cb2b2694768803ed347a1026b881fd624951..150d12e27c2de0740af5c554286358f8 protected Mob(EntityType entityType, Level level) { super(entityType, level); -@@ -285,6 +286,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -295,6 +_,7 @@ target = null; } } @@ -24,13 +16,14 @@ index e0b3cb2b2694768803ed347a1026b881fd624951..150d12e27c2de0740af5c554286358f8 this.target = target; return true; // CraftBukkit end -@@ -328,8 +330,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -338,7 +_,27 @@ } profilerFiller.pop(); +- } + incrementTicksSinceLastInteraction(); // Purpur - Entity lifespan - } - ++ } ++ + // Purpur start - Entity lifespan + private void incrementTicksSinceLastInteraction() { + ++this.ticksSinceLastInteraction; @@ -49,11 +42,10 @@ index e0b3cb2b2694768803ed347a1026b881fd624951..150d12e27c2de0740af5c554286358f8 + } + } + // Purpur end - Entity lifespan -+ + @Override protected void playHurtSound(DamageSource source) { - this.resetAmbientSoundTime(); -@@ -433,6 +455,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -443,6 +_,7 @@ output.putString("Paper.DespawnInPeacefulOverride", this.despawnInPeacefulOverride.name()); } // Paper end - allow changing despawnInPeaceful @@ -61,15 +53,15 @@ index e0b3cb2b2694768803ed347a1026b881fd624951..150d12e27c2de0740af5c554286358f8 } @Override -@@ -461,6 +484,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -470,6 +_,7 @@ + this.lootTableSeed = input.getLongOr("DeathLootTableSeed", 0L); this.setNoAi(input.getBooleanOr("NoAI", false)); this.aware = input.getBooleanOr("Bukkit.Aware", true); // CraftBukkit - this.despawnInPeacefulOverride = input.read("Paper.DespawnInPeacefulOverride", io.papermc.paper.util.PaperCodecs.TRI_STATE_CODEC).orElse(net.kyori.adventure.util.TriState.NOT_SET); // Paper - allow changing despawnInPeaceful + this.ticksSinceLastInteraction = input.getIntOr("Purpur.ticksSinceLastInteraction", 0); // Purpur- Entity lifespan + // Paper start - allow changing despawnInPeaceful + this.despawnInPeacefulOverride = readDespawnInPeacefulOverride(input); } - - @Override -@@ -1201,7 +1225,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1210,7 +_,7 @@ ); } @@ -78,7 +70,7 @@ index e0b3cb2b2694768803ed347a1026b881fd624951..150d12e27c2de0740af5c554286358f8 return spawnGroupData; } -@@ -1538,6 +1562,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1557,6 +_,7 @@ this.playAttackSound(); } diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/player/Player.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch similarity index 82% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/player/Player.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch index 1724f5573..861dbc575 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/player/Player.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java -index e5e08dbefead90e9fe2bb05e4f0257f7aa4c0686..fd0322685f17f188d19ccc5fc8d2995bfab17f6e 100644 --- a/net/minecraft/world/entity/player/Player.java +++ b/net/minecraft/world/entity/player/Player.java -@@ -219,11 +219,20 @@ public abstract class Player extends LivingEntity { +@@ -180,11 +_,20 @@ private int currentImpulseContextResetGraceTime = 0; public boolean affectsSpawning = true; // Paper - Affects Spawning API public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage @@ -29,7 +21,7 @@ index e5e08dbefead90e9fe2bb05e4f0257f7aa4c0686..fd0322685f17f188d19ccc5fc8d2995b @Override public org.bukkit.craftbukkit.entity.CraftHumanEntity getBukkitEntity() { return (org.bukkit.craftbukkit.entity.CraftHumanEntity) super.getBukkitEntity(); -@@ -287,6 +296,12 @@ public abstract class Player extends LivingEntity { +@@ -246,6 +_,12 @@ @Override public void tick() { @@ -42,7 +34,7 @@ index e5e08dbefead90e9fe2bb05e4f0257f7aa4c0686..fd0322685f17f188d19ccc5fc8d2995b this.noPhysics = this.isSpectator(); if (this.isSpectator() || this.isPassenger()) { this.setOnGround(false); -@@ -365,6 +380,17 @@ public abstract class Player extends LivingEntity { +@@ -301,6 +_,17 @@ this.turtleHelmetTick(); } @@ -60,7 +52,7 @@ index e5e08dbefead90e9fe2bb05e4f0257f7aa4c0686..fd0322685f17f188d19ccc5fc8d2995b this.cooldowns.tick(); this.updatePlayerPose(); if (this.currentImpulseContextResetGraceTime > 0) { -@@ -630,7 +656,7 @@ public abstract class Player extends LivingEntity { +@@ -512,7 +_,7 @@ List list = Lists.newArrayList(); for (Entity entity : entities) { @@ -69,7 +61,7 @@ index e5e08dbefead90e9fe2bb05e4f0257f7aa4c0686..fd0322685f17f188d19ccc5fc8d2995b list.add(entity); } else if (!entity.isRemoved()) { this.touch(entity); -@@ -1226,7 +1252,7 @@ public abstract class Player extends LivingEntity { +@@ -1074,7 +_,7 @@ flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits if (flag2) { damageSource = damageSource.critical(); // Paper - critical damage API @@ -78,7 +70,7 @@ index e5e08dbefead90e9fe2bb05e4f0257f7aa4c0686..fd0322685f17f188d19ccc5fc8d2995b } float f2 = f + f1; -@@ -1822,7 +1848,23 @@ public abstract class Player extends LivingEntity { +@@ -1674,7 +_,23 @@ @Override protected int getBaseExperienceReward(ServerLevel level) { @@ -103,17 +95,17 @@ index e5e08dbefead90e9fe2bb05e4f0257f7aa4c0686..fd0322685f17f188d19ccc5fc8d2995b } @Override -@@ -1861,6 +1903,13 @@ public abstract class Player extends LivingEntity { +@@ -1717,6 +_,13 @@ + public boolean addItem(ItemStack stack) { return this.inventory.add(stack); } - ++ + // Purpur start - Player ridable in water option + @Override + public boolean dismountsUnderwater() { + return !level().purpurConfig.playerRidableInWater; + } + // Purpur end - Player ridable in water option -+ - public boolean setEntityOnShoulder(CompoundTag entityCompound) { - if (this.isPassenger() || !this.onGround() || this.isInWater() || this.isInPowderSnow) { - return false; + + @Nullable + public abstract GameType gameMode(); diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/AxeItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/AxeItem.java.patch similarity index 75% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/AxeItem.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/item/AxeItem.java.patch index 6c6b19bc6..bfa2d177a 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/AxeItem.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/AxeItem.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/item/AxeItem.java b/net/minecraft/world/item/AxeItem.java -index bd919b9a83f9736f02783b1ba3863fd1b77c7e89..eb8d2d6f9c65185f5fe16a13ab0cdbba78a25a40 100644 --- a/net/minecraft/world/item/AxeItem.java +++ b/net/minecraft/world/item/AxeItem.java -@@ -62,13 +62,15 @@ public class AxeItem extends Item { +@@ -64,13 +_,15 @@ if (playerHasBlockingItemUseIntent(context)) { return InteractionResult.PASS; } else { @@ -26,7 +18,7 @@ index bd919b9a83f9736f02783b1ba3863fd1b77c7e89..eb8d2d6f9c65185f5fe16a13ab0cdbba return InteractionResult.PASS; } // Paper end -@@ -76,8 +78,15 @@ public class AxeItem extends Item { +@@ -78,8 +_,15 @@ CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, clickedPos, itemInHand); } @@ -42,9 +34,9 @@ index bd919b9a83f9736f02783b1ba3863fd1b77c7e89..eb8d2d6f9c65185f5fe16a13ab0cdbba + level.gameEvent(GameEvent.BLOCK_CHANGE, clickedPos, GameEvent.Context.of(player, state)); + // Purpur end - Tool actionable options if (player != null) { - itemInHand.hurtAndBreak(1, player, LivingEntity.getSlotForHand(context.getHand())); + itemInHand.hurtAndBreak(1, player, context.getHand().asEquipmentSlot()); } -@@ -94,22 +103,24 @@ public class AxeItem extends Item { +@@ -96,21 +_,23 @@ && !player.isSecondaryUseActive(); } @@ -60,9 +52,8 @@ index bd919b9a83f9736f02783b1ba3863fd1b77c7e89..eb8d2d6f9c65185f5fe16a13ab0cdbba - Optional previous = WeatheringCopper.getPrevious(state); + Optional previous = Optional.ofNullable(level.purpurConfig.axeWeatherables.get(state.getBlock())); // Purpur - Tool actionable options if (previous.isPresent()) { -- level.playSound(player, pos, SoundEvents.AXE_SCRAPE, SoundSource.BLOCKS, 1.0F, 1.0F); -+ level.playSound(WeatheringCopper.getPrevious(state).isPresent() ? player : null, pos, SoundEvents.AXE_SCRAPE, SoundSource.BLOCKS, 1.0F, 1.0F); // Purpur - Tool actionable options - force sound - level.levelEvent(player, 3005, pos, 0); +- spawnSoundAndParticle(level, pos, player, state, SoundEvents.AXE_SCRAPE, 3005); ++ spawnSoundAndParticle(level, pos, WeatheringCopper.getPrevious(state).isPresent() ? player : null, state, SoundEvents.AXE_SCRAPE, 3005); // Purpur - Tool actionable options - force sound return previous; } else { - Optional optional = Optional.ofNullable(HoneycombItem.WAX_OFF_BY_BLOCK.get().get(state.getBlock())) @@ -72,8 +63,8 @@ index bd919b9a83f9736f02783b1ba3863fd1b77c7e89..eb8d2d6f9c65185f5fe16a13ab0cdbba + // .map(block -> block.withPropertiesOf(state)); + // Purpur end - Tool actionable options if (optional.isPresent()) { -- level.playSound(player, pos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); -+ level.playSound(HoneycombItem.WAX_OFF_BY_BLOCK.get().containsKey(state.getBlock()) ? player : null, pos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); // Purpur - Tool actionable options - force sound - level.levelEvent(player, 3004, pos, 0); +- spawnSoundAndParticle(level, pos, player, state, SoundEvents.AXE_WAX_OFF, 3004); ++ spawnSoundAndParticle(level, pos, HoneycombItem.WAX_OFF_BY_BLOCK.get().containsKey(state.getBlock()) ? player : null, state, SoundEvents.AXE_WAX_OFF, 3004); // Purpur - Tool actionable options - force sound return optional; } else { + return Optional.empty(); diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BlockItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BlockItem.java.patch similarity index 75% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BlockItem.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/item/BlockItem.java.patch index 21fcde34d..54652a635 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BlockItem.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BlockItem.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java -index 6db566adf2d0df1d26221eda04aa01738df6d3d2..3dbdb5c30f8af89e768016bb683a4d2c1549aa0e 100644 --- a/net/minecraft/world/item/BlockItem.java +++ b/net/minecraft/world/item/BlockItem.java -@@ -144,7 +144,16 @@ public class BlockItem extends Item { +@@ -143,7 +_,16 @@ } protected boolean updateCustomBlockEntityTag(BlockPos pos, Level level, @Nullable Player player, ItemStack stack, BlockState state) { @@ -26,15 +18,15 @@ index 6db566adf2d0df1d26221eda04aa01738df6d3d2..3dbdb5c30f8af89e768016bb683a4d2c } @Nullable -@@ -211,6 +220,7 @@ public class BlockItem extends Item { +@@ -205,6 +_,7 @@ } if (!type.onlyOpCanSetNbt() || player != null && (player.canUseGameMasterBlocks() || (player.getAbilities().instabuild && player.getBukkitEntity().hasPermission("minecraft.nbt.place")))) { // Spigot - add permission + if (!(level.purpurConfig.silkTouchEnabled && blockEntity instanceof net.minecraft.world.level.block.entity.SpawnerBlockEntity && player.getBukkitEntity().hasPermission("purpur.drop.spawners"))) // Purpur - Silk touch spawners - return customData.loadInto(blockEntity, level.registryAccess()); + return typedEntityData.loadInto(blockEntity, level.registryAccess()); } -@@ -252,6 +262,7 @@ public class BlockItem extends Item { +@@ -245,6 +_,7 @@ public void onDestroyed(ItemEntity itemEntity) { ItemContainerContents itemContainerContents = itemEntity.getItem().set(DataComponents.CONTAINER, ItemContainerContents.EMPTY); if (itemContainerContents != null) { diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/HoeItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/HoeItem.java.patch similarity index 80% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/HoeItem.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/item/HoeItem.java.patch index 3acfeaf2e..cfe01d6ad 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/HoeItem.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/HoeItem.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/item/HoeItem.java b/net/minecraft/world/item/HoeItem.java -index 3bf3d4030c4da65fa386a8b8083d259a6046d15e..77a8d5d334cd93d23149afa8e58f4114412632df 100644 --- a/net/minecraft/world/item/HoeItem.java +++ b/net/minecraft/world/item/HoeItem.java -@@ -45,15 +45,25 @@ public class HoeItem extends Item { +@@ -44,15 +_,25 @@ public InteractionResult useOn(UseOnContext context) { Level level = context.getLevel(); BlockPos clickedPos = context.getClickedPos(); @@ -36,6 +28,6 @@ index 3bf3d4030c4da65fa386a8b8083d259a6046d15e..77a8d5d334cd93d23149afa8e58f4114 Player player = context.getPlayer(); - level.playSound(player, clickedPos, SoundEvents.HOE_TILL, SoundSource.BLOCKS, 1.0F, 1.0F); + if (!TILLABLES.containsKey(clickedBlock)) level.playSound(null, clickedPos, SoundEvents.HOE_TILL, SoundSource.BLOCKS, 1.0F, 1.0F); // Purpur - Tool actionable options - force sound - if (!level.isClientSide) { + if (!level.isClientSide()) { consumer.accept(context); if (player != null) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SpawnEggItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SpawnEggItem.java.patch new file mode 100644 index 000000000..7c068db48 --- /dev/null +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SpawnEggItem.java.patch @@ -0,0 +1,26 @@ +--- a/net/minecraft/world/item/SpawnEggItem.java ++++ b/net/minecraft/world/item/SpawnEggItem.java +@@ -68,6 +_,23 @@ + return InteractionResult.FAIL; + } else { + if (level.paperConfig().entities.spawning.disableMobSpawnerSpawnEggTransformation) return InteractionResult.FAIL; // Paper - Allow disabling mob spawner spawn egg transformation ++ // Purpur start - PlayerSetSpawnerTypeWithEggEvent ++ if (spawner instanceof net.minecraft.world.level.block.entity.SpawnerBlockEntity) { ++ org.bukkit.block.Block bukkitBlock = level.getWorld().getBlockAt(clickedPos.getX(), clickedPos.getY(), clickedPos.getZ()); ++ org.purpurmc.purpur.event.PlayerSetSpawnerTypeWithEggEvent event = new org.purpurmc.purpur.event.PlayerSetSpawnerTypeWithEggEvent((org.bukkit.entity.Player) context.getPlayer().getBukkitEntity(), bukkitBlock, (org.bukkit.block.CreatureSpawner) bukkitBlock.getState(), org.bukkit.entity.EntityType.fromName(type.getName())); ++ if (!event.callEvent()) { ++ return InteractionResult.FAIL; ++ } ++ type = EntityType.getFromBukkitType(event.getEntityType()); ++ } else if (spawner instanceof net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity) { ++ org.bukkit.block.Block bukkitBlock = level.getWorld().getBlockAt(clickedPos.getX(), clickedPos.getY(), clickedPos.getZ()); ++ org.purpurmc.purpur.event.PlayerSetTrialSpawnerTypeWithEggEvent event = new org.purpurmc.purpur.event.PlayerSetTrialSpawnerTypeWithEggEvent((org.bukkit.entity.Player) context.getPlayer().getBukkitEntity(), bukkitBlock, (org.bukkit.block.TrialSpawner) bukkitBlock.getState(), org.bukkit.entity.EntityType.fromName(type.getName())); ++ if (!event.callEvent()) { ++ return InteractionResult.FAIL; ++ } ++ type = EntityType.getFromBukkitType(event.getEntityType()); ++ } ++ // Purpur end - PlayerSetSpawnerTypeWithEggEvent + spawner.setEntityId(type, level.getRandom()); + level.sendBlockUpdated(clickedPos, blockState, blockState, 3); + level.gameEvent(context.getPlayer(), GameEvent.BLOCK_CHANGE, clickedPos); diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/Block.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Block.java.patch similarity index 78% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/Block.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Block.java.patch index a2e463ff7..9139c8898 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/Block.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Block.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java -index be6f37f91569c659c609e5e8d38671ca86f8cd95..d023c985344807db2180665a15d282fa50754299 100644 --- a/net/minecraft/world/level/block/Block.java +++ b/net/minecraft/world/level/block/Block.java -@@ -99,6 +99,10 @@ public class Block extends BlockBehaviour implements ItemLike { +@@ -103,6 +_,10 @@ public static final int UPDATE_LIMIT = 512; protected final StateDefinition stateDefinition; private BlockState defaultBlockState; @@ -19,7 +11,7 @@ index be6f37f91569c659c609e5e8d38671ca86f8cd95..d023c985344807db2180665a15d282fa // Paper start - Protect Bedrock and End Portal/Frames from being destroyed public final boolean isDestroyable() { return io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowPermanentBlockBreakExploits || -@@ -345,7 +349,7 @@ public class Block extends BlockBehaviour implements ItemLike { +@@ -384,7 +_,7 @@ event.setExpToDrop(block.getExpDrop(state, serverLevel, pos, net.minecraft.world.item.ItemStack.EMPTY, true)); // Paper - Properly handle xp dropping event.callEvent(); for (org.bukkit.inventory.ItemStack drop : event.getDrops()) { @@ -28,21 +20,21 @@ index be6f37f91569c659c609e5e8d38671ca86f8cd95..d023c985344807db2180665a15d282fa } state.spawnAfterBreak(serverLevel, pos, ItemStack.EMPTY, false); // Paper - Properly handle xp dropping block.popExperience(serverLevel, pos, event.getExpToDrop()); // Paper - Properly handle xp dropping -@@ -363,7 +367,7 @@ public class Block extends BlockBehaviour implements ItemLike { +@@ -402,7 +_,7 @@ public static void dropResources(BlockState state, LevelAccessor level, BlockPos pos, @Nullable BlockEntity blockEntity) { if (level instanceof ServerLevel) { -- getDrops(state, (ServerLevel)level, pos, blockEntity).forEach(stack -> popResource((ServerLevel)level, pos, stack)); -+ getDrops(state, (ServerLevel)level, pos, blockEntity).forEach(stack -> popResource((ServerLevel)level, pos, applyLoreFromTile(stack, blockEntity))); // Purpur - Persistent BlockEntity Lore and DisplayName +- getDrops(state, (ServerLevel)level, pos, blockEntity).forEach(itemStack -> popResource((ServerLevel)level, pos, itemStack)); ++ getDrops(state, (ServerLevel)level, pos, blockEntity).forEach(itemStack -> popResource((ServerLevel)level, pos, applyLoreFromTile(itemStack, blockEntity))); // Purpur - Persistent BlockEntity Lore and DisplayName state.spawnAfterBreak((ServerLevel)level, pos, ItemStack.EMPTY, true); } } -@@ -375,11 +379,30 @@ public class Block extends BlockBehaviour implements ItemLike { +@@ -414,11 +_,30 @@ public static void dropResources(BlockState state, Level level, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool, boolean dropExperience) { // Paper end - Properly handle xp dropping if (level instanceof ServerLevel) { -- getDrops(state, (ServerLevel)level, pos, blockEntity, entity, tool).forEach(stack -> popResource(level, pos, stack)); -+ getDrops(state, (ServerLevel)level, pos, blockEntity, entity, tool).forEach(stack -> popResource(level, pos, applyLoreFromTile(stack, blockEntity))); // Purpur - Persistent BlockEntity Lore and DisplayName +- getDrops(state, (ServerLevel)level, pos, blockEntity, entity, tool).forEach(itemStack -> popResource(level, pos, itemStack)); ++ getDrops(state, (ServerLevel)level, pos, blockEntity, entity, tool).forEach(itemStack -> popResource(level, pos, applyLoreFromTile(itemStack, blockEntity))); // Purpur - Persistent BlockEntity Lore and DisplayName state.spawnAfterBreak((ServerLevel)level, pos, tool, dropExperience); // Paper - Properly handle xp dropping } } @@ -69,10 +61,11 @@ index be6f37f91569c659c609e5e8d38671ca86f8cd95..d023c985344807db2180665a15d282fa public static void popResource(Level level, BlockPos pos, ItemStack stack) { double d = EntityType.ITEM.getHeight() / 2.0; double d1 = pos.getX() + 0.5 + Mth.nextDouble(level.random, -0.25, 0.25); -@@ -460,7 +483,15 @@ public class Block extends BlockBehaviour implements ItemLike { +@@ -499,7 +_,15 @@ } public void setPlacedBy(Level level, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { +- } + this.placer = placer; // Purpur - Store placer on Block when placed + } + @@ -80,12 +73,12 @@ index be6f37f91569c659c609e5e8d38671ca86f8cd95..d023c985344807db2180665a15d282fa + @Nullable protected LivingEntity placer = null; + public void forgetPlacer() { + this.placer = null; - } ++ } + // Purpur end - Store placer on Block when placed public boolean isPossibleToRespawnInThis(BlockState state) { return !state.isSolid() && !state.liquid(); -@@ -471,7 +502,7 @@ public class Block extends BlockBehaviour implements ItemLike { +@@ -510,7 +_,7 @@ } public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, double fallDistance) { diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch similarity index 55% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch index 7ccc03e85..37c2a4ea1 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch @@ -1,31 +1,24 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/level/block/CarvedPumpkinBlock.java b/net/minecraft/world/level/block/CarvedPumpkinBlock.java -index 7cdf16c7216878350537b5331081cb30f44d6dbb..a4854370dfdcbc7ec4c27975e4feb69d4cb48a11 100644 --- a/net/minecraft/world/level/block/CarvedPumpkinBlock.java +++ b/net/minecraft/world/level/block/CarvedPumpkinBlock.java -@@ -64,7 +64,7 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock { +@@ -74,7 +_,7 @@ if (blockPatternMatch != null) { SnowGolem snowGolem = EntityType.SNOW_GOLEM.create(level, EntitySpawnReason.TRIGGERED); if (snowGolem != null) { - spawnGolemInWorld(level, blockPatternMatch, snowGolem, blockPatternMatch.getBlock(0, 2, 0).getPos()); + spawnGolemInWorld(level, blockPatternMatch, snowGolem, blockPatternMatch.getBlock(0, 2, 0).getPos(), this.placer); // Purpur - Summoner API - } - } else { - BlockPattern.BlockPatternMatch blockPatternMatch1 = this.getOrCreateIronGolemFull().find(level, pos); -@@ -72,13 +72,23 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock { - IronGolem ironGolem = EntityType.IRON_GOLEM.create(level, EntitySpawnReason.TRIGGERED); - if (ironGolem != null) { - ironGolem.setPlayerCreated(true); -- spawnGolemInWorld(level, blockPatternMatch1, ironGolem, blockPatternMatch1.getBlock(1, 2, 0).getPos()); -+ spawnGolemInWorld(level, blockPatternMatch1, ironGolem, blockPatternMatch1.getBlock(1, 2, 0).getPos(), this.placer); // Purpur - Summoner API - } + return; } } +@@ -84,7 +_,7 @@ + IronGolem ironGolem = EntityType.IRON_GOLEM.create(level, EntitySpawnReason.TRIGGERED); + if (ironGolem != null) { + ironGolem.setPlayerCreated(true); +- spawnGolemInWorld(level, blockPatternMatch1, ironGolem, blockPatternMatch1.getBlock(1, 2, 0).getPos()); ++ spawnGolemInWorld(level, blockPatternMatch1, ironGolem, blockPatternMatch1.getBlock(1, 2, 0).getPos(), this.placer); // Purpur - Summoner API + return; + } + } +@@ -112,6 +_,16 @@ } private static void spawnGolemInWorld(Level level, BlockPattern.BlockPatternMatch patternMatch, Entity golem, BlockPos pos) { diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ComposterBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ComposterBlock.java.patch similarity index 78% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ComposterBlock.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ComposterBlock.java.patch index 170f0f56d..e7743d07a 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ComposterBlock.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ComposterBlock.java.patch @@ -1,18 +1,10 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/level/block/ComposterBlock.java b/net/minecraft/world/level/block/ComposterBlock.java -index a647d76d365a60b95a3eb7927ac426bf70d417f3..3eb11df5d14ec63911be630ca99d8d9903723f9b 100644 --- a/net/minecraft/world/level/block/ComposterBlock.java +++ b/net/minecraft/world/level/block/ComposterBlock.java -@@ -250,17 +250,27 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder { +@@ -250,23 +_,52 @@ ) { int levelValue = state.getValue(LEVEL); if (levelValue < 8 && COMPOSTABLES.containsKey(stack.getItem())) { -- if (levelValue < 7 && !level.isClientSide) { +- if (levelValue < 7 && !level.isClientSide()) { - BlockState blockState = addItem(player, state, level, pos, stack); - // Paper start - handle cancelled events - if (blockState == null) { @@ -22,6 +14,7 @@ index a647d76d365a60b95a3eb7927ac426bf70d417f3..3eb11df5d14ec63911be630ca99d8d99 - level.levelEvent(1500, pos, state != blockState ? 1 : 0); - player.awardStat(Stats.ITEM_USED.get(stack.getItem())); - stack.consume(1, player); +- } + // Purpur start - sneak to bulk process composter + BlockState newState = process(levelValue, player, state, level, pos, stack); + if (newState == null) { @@ -41,18 +34,18 @@ index a647d76d365a60b95a3eb7927ac426bf70d417f3..3eb11df5d14ec63911be630ca99d8d99 + newCount = stack.getCount(); + newLevel = newState.getValue(ComposterBlock.LEVEL); + } while (newCount > 0 && (newCount != oldCount || newLevel != oldLevel || newState != oldState)); - } ++ } + // Purpur end - Sneak to bulk process composter return InteractionResult.SUCCESS; } else { -@@ -268,6 +278,25 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder { + return super.useItemOn(stack, state, level, pos, player, hand, hitResult); } } - ++ + // Purpur start - sneak to bulk process composter + private static @Nullable BlockState process(int levelValue, Player player, BlockState state, Level level, BlockPos pos, ItemStack stack) { -+ if (levelValue < 7 && !level.isClientSide) { ++ if (levelValue < 7 && !level.isClientSide()) { + BlockState iblockdata1 = ComposterBlock.addItem(player, state, level, pos, stack); + // Paper start - handle cancelled events + if (iblockdata1 == null) { @@ -68,7 +61,6 @@ index a647d76d365a60b95a3eb7927ac426bf70d417f3..3eb11df5d14ec63911be630ca99d8d99 + return state; + } + // Purpur end - Sneak to bulk process composter -+ + @Override protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) { - int levelValue = state.getValue(LEVEL); diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch similarity index 73% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch index 4eb4192d1..117a0b2fe 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java -index 91f7ee163107d846e7f6a5783be6eff96e783886..b1b49fa83794f4237994e9b985816ddf6d20b7e9 100644 --- a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +++ b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java -@@ -75,7 +75,7 @@ public class BeehiveBlockEntity extends BlockEntity { +@@ -77,7 +_,7 @@ "leash", "UUID" ); @@ -17,7 +9,7 @@ index 91f7ee163107d846e7f6a5783be6eff96e783886..b1b49fa83794f4237994e9b985816ddf private static final int MIN_TICKS_BEFORE_REENTERING_HIVE = 400; private static final int MIN_OCCUPATION_TICKS_NECTAR = 2400; public static final int MIN_OCCUPATION_TICKS_NECTARLESS = 600; -@@ -150,11 +150,33 @@ public class BeehiveBlockEntity extends BlockEntity { +@@ -152,11 +_,33 @@ return list; } @@ -51,8 +43,8 @@ index 91f7ee163107d846e7f6a5783be6eff96e783886..b1b49fa83794f4237994e9b985816ddf // Paper start - Add EntityBlockStorage clearEntities public void clearBees() { this.stored.clear(); -@@ -392,8 +414,8 @@ public class BeehiveBlockEntity extends BlockEntity { - return this.stored.stream().map(BeehiveBlockEntity.BeeData::toOccupant).toList(); +@@ -397,8 +_,8 @@ + registration.register(DebugSubscriptions.BEE_HIVES, () -> DebugHiveInfo.pack(this)); } - static class BeeData { diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch similarity index 78% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch index 1a2c3b9b4..1b2e1af50 100644 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch @@ -1,14 +1,6 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/level/block/entity/ConduitBlockEntity.java b/net/minecraft/world/level/block/entity/ConduitBlockEntity.java -index 0e87d20639c382be2221d73c7498480d21ebeafb..3ea9fe4c936f024c15a6bba6e7c5d960a3def1f9 100644 --- a/net/minecraft/world/level/block/entity/ConduitBlockEntity.java +++ b/net/minecraft/world/level/block/entity/ConduitBlockEntity.java -@@ -151,7 +151,7 @@ public class ConduitBlockEntity extends BlockEntity { +@@ -151,7 +_,7 @@ BlockPos blockPos1 = pos.offset(i, i1, i2x); BlockState blockState = level.getBlockState(blockPos1); @@ -17,7 +9,7 @@ index 0e87d20639c382be2221d73c7498480d21ebeafb..3ea9fe4c936f024c15a6bba6e7c5d960 if (blockState.is(block)) { positions.add(blockPos1); } -@@ -166,13 +166,13 @@ public class ConduitBlockEntity extends BlockEntity { +@@ -166,13 +_,13 @@ private static void applyEffects(Level level, BlockPos pos, List positions) { // CraftBukkit start @@ -34,19 +26,19 @@ index 0e87d20639c382be2221d73c7498480d21ebeafb..3ea9fe4c936f024c15a6bba6e7c5d960 // CraftBukkit start return i; } -@@ -202,7 +202,7 @@ public class ConduitBlockEntity extends BlockEntity { +@@ -202,7 +_,7 @@ EntityReference entityReference = updateDestroyTarget(blockEntity.destroyTarget, level, pos, canDestroy); - LivingEntity livingEntity = EntityReference.get(entityReference, level, LivingEntity.class); + LivingEntity livingEntity = EntityReference.getLivingEntity(entityReference, level); if (damageTarget && livingEntity != null) { // CraftBukkit - if (livingEntity.hurtServer(level, level.damageSources().magic().eventBlockDamager(level, pos), 4.0F)) // CraftBukkit - move up + if (livingEntity.hurtServer(level, level.damageSources().magic().eventBlockDamager(level, pos), level.purpurConfig.conduitDamageAmount)) // CraftBukkit - move up // Purpur - Conduit behavior configuration level.playSound( null, livingEntity.getX(), livingEntity.getY(), livingEntity.getZ(), SoundEvents.CONDUIT_ATTACK_TARGET, SoundSource.BLOCKS, 1.0F, 1.0F ); -@@ -224,20 +224,26 @@ public class ConduitBlockEntity extends BlockEntity { +@@ -224,20 +_,26 @@ return selectNewTarget(level, pos); } else { - LivingEntity livingEntity = EntityReference.get(destroyTarget, level, LivingEntity.class); + LivingEntity livingEntity = EntityReference.getLivingEntity(destroyTarget, level); - return livingEntity != null && livingEntity.isAlive() && pos.closerThan(livingEntity.blockPosition(), 8.0) ? destroyTarget : null; + return livingEntity != null && livingEntity.isAlive() && pos.closerThan(livingEntity.blockPosition(), level.purpurConfig.conduitDamageDistance) ? destroyTarget : null; // Purpur - Conduit behavior configuration } @@ -58,7 +50,7 @@ index 0e87d20639c382be2221d73c7498480d21ebeafb..3ea9fe4c936f024c15a6bba6e7c5d960 - LivingEntity.class, getDestroyRangeAABB(pos), livingEntity -> livingEntity instanceof Enemy && livingEntity.isInWaterOrRain() + LivingEntity.class, getDestroyRangeAABB(pos, level), livingEntity -> livingEntity instanceof Enemy && livingEntity.isInWaterOrRain() // Purpur - Conduit behavior configuration ); - return entitiesOfClass.isEmpty() ? null : new EntityReference<>(Util.getRandom(entitiesOfClass, level.random)); + return entitiesOfClass.isEmpty() ? null : EntityReference.of(Util.getRandom(entitiesOfClass, level.random)); } public static AABB getDestroyRangeAABB(BlockPos pos) { diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/SpawnEggItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/SpawnEggItem.java.patch deleted file mode 100644 index 6301e8389..000000000 --- a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/SpawnEggItem.java.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 06:37:42 -0700 -Subject: [PATCH] purpur File Patches - - -diff --git a/net/minecraft/world/item/SpawnEggItem.java b/net/minecraft/world/item/SpawnEggItem.java -index 7a961e5ebbdac061f6e73e4ed07fe957ba759066..d48c1dedbd39770ccf3c9c3ff3351b391601cd77 100644 ---- a/net/minecraft/world/item/SpawnEggItem.java -+++ b/net/minecraft/world/item/SpawnEggItem.java -@@ -57,6 +57,23 @@ public class SpawnEggItem extends Item { - if (level.getBlockEntity(clickedPos) instanceof Spawner spawner) { - if (level.paperConfig().entities.spawning.disableMobSpawnerSpawnEggTransformation) return InteractionResult.FAIL; // Paper - Allow disabling mob spawner spawn egg transformation - EntityType type = this.getType(level.registryAccess(), itemInHand); -+ // Purpur start - PlayerSetSpawnerTypeWithEggEvent -+ if (spawner instanceof net.minecraft.world.level.block.entity.SpawnerBlockEntity) { -+ org.bukkit.block.Block bukkitBlock = level.getWorld().getBlockAt(clickedPos.getX(), clickedPos.getY(), clickedPos.getZ()); -+ org.purpurmc.purpur.event.PlayerSetSpawnerTypeWithEggEvent event = new org.purpurmc.purpur.event.PlayerSetSpawnerTypeWithEggEvent((org.bukkit.entity.Player) context.getPlayer().getBukkitEntity(), bukkitBlock, (org.bukkit.block.CreatureSpawner) bukkitBlock.getState(), org.bukkit.entity.EntityType.fromName(type.getName())); -+ if (!event.callEvent()) { -+ return InteractionResult.FAIL; -+ } -+ type = EntityType.getFromBukkitType(event.getEntityType()); -+ } else if (spawner instanceof net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity) { -+ org.bukkit.block.Block bukkitBlock = level.getWorld().getBlockAt(clickedPos.getX(), clickedPos.getY(), clickedPos.getZ()); -+ org.purpurmc.purpur.event.PlayerSetTrialSpawnerTypeWithEggEvent event = new org.purpurmc.purpur.event.PlayerSetTrialSpawnerTypeWithEggEvent((org.bukkit.entity.Player) context.getPlayer().getBukkitEntity(), bukkitBlock, (org.bukkit.block.TrialSpawner) bukkitBlock.getState(), org.bukkit.entity.EntityType.fromName(type.getName())); -+ if (!event.callEvent()) { -+ return InteractionResult.FAIL; -+ } -+ type = EntityType.getFromBukkitType(event.getEntityType()); -+ } -+ // Purpur end - PlayerSetSpawnerTypeWithEggEvent - spawner.setEntityId(type, level.getRandom()); - level.sendBlockUpdated(clickedPos, blockState, blockState, 3); - level.gameEvent(context.getPlayer(), GameEvent.BLOCK_CHANGE, clickedPos);