Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ca8da0e3 Commands
PaperMC/Paper@e0437448 /net/minecraft/world/entity/decoration/
PaperMC/Paper@d251511d net\minecraft\worldntity\projectile\
PaperMC/Paper@62c4dda5 /net/minecraft/world/entity/monster
PaperMC/Paper@4a821685 ServerPlayer, ServerLevel, ServerEntity
PaperMC/Paper@6d71abd2 Other random classes
PaperMC/Paper@f44197c4 net/minecraft/world/entity/item
PaperMC/Paper@2f152e01 Fix some compile errors
PaperMC/Paper@92ece7b6 Fix dropped diff
PaperMC/Paper@8c974745 readd dropped ack diff
This commit is contained in:
granny
2025-05-30 19:51:05 -07:00
parent 3ba90894b1
commit cfd1e070a2
12 changed files with 1 additions and 1 deletions

View File

@@ -0,0 +1,18 @@
From 10208bcef5c949e133092f588296ebb6e22f36d8 Mon Sep 17 00:00:00 2001
From: File <noreply+automated@papermc.io>
Date: Sun, 20 Apr 1997 06:37:42 -0700
Subject: [PATCH] purpur File Patches
diff --git a/net/minecraft/world/level/BaseSpawner.java b/net/minecraft/world/level/BaseSpawner.java
index 650ebce14d618076cec2066d134d2ae51a87076a..0babc951d9fed6d32d3dba549cc5ced4dc6b0588 100644
--- a/net/minecraft/world/level/BaseSpawner.java
+++ b/net/minecraft/world/level/BaseSpawner.java
@@ -54,6 +54,7 @@ public abstract class BaseSpawner {
}
public boolean isNearPlayer(Level level, BlockPos pos) {
+ if (level.purpurConfig.spawnerDeactivateByRedstone && level.hasNeighborSignal(pos)) return false; // Purpur - Redstone deactivates spawners
return level.hasNearbyAlivePlayerThatAffectsSpawning(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, this.requiredPlayerRange); // Paper - Affects Spawning API
}