Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@15309f9a Update to 1.21.11-rc2
PaperMC/Paper@f34efdb7 Pass SWEEP_ATTACK knockback reason
PaperMC/Paper@eb37433d Re-add configurable combat exhaustion and event
PaperMC/Paper@31af44d2 Re-add dropped hunk for visibility sounds
PaperMC/Paper@252cfe14 Fix unnecessary player info remove packets being sent when hiding players (#12587)
PaperMC/Paper@62dc8b32 Use book packet for both methods (#13298)
PaperMC/Paper@7fdc16a8  Add configuration option to control fix for MC-159283 end rings (#13363)
PaperMC/Paper@bb6c2d08 Use correct addresses for PlayerConnection (#13307)
PaperMC/Paper@f08aad23 [ci/skip] Clarify Metadata API deprecation message (#13371)
PaperMC/Paper@5f03e110 Fix isInteractable for copper chests (#13325)
PaperMC/Paper@a339457c Readd dropped shulker box block hunk
PaperMC/Paper@843cafd8 Update to 1.21.11-rc3
PaperMC/Paper@7db609b0 [ci/skip] diff housekeeping
PaperMC/Paper@f6e937b9 Reimplement int based gamerule access (#13372)
This commit is contained in:
granny
2025-12-08 19:24:46 -08:00
parent 4385807b7e
commit c51992977f
10 changed files with 143 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch
View File

@@ -65,7 +65,7 @@
this.generator = generator;
this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment);
@@ -2081,4 +_,14 @@
@@ -2091,4 +_,14 @@
return this.moonrise$getEntityLookup().getEntityCount(); // Paper - rewrite chunk system
}
// Paper end - allow patching this logic

6
purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch
View File

@@ -35,9 +35,9 @@
);
}
}
@@ -308,6 +_,27 @@
return new CommandSourceStack(commandSource, Vec3.atCenterOf(pos), Vec2.ZERO, level, LevelBasedPermissionSet.GAMEMASTER, string, component, level.getServer(), player
); // Paper - Fix commands from signs not firing command events
@@ -307,6 +_,27 @@
// CraftBukkit - this
return new CommandSourceStack(commandSource, Vec3.atCenterOf(pos), Vec2.ZERO, level, LevelBasedPermissionSet.GAMEMASTER, string, component, level.getServer(), player); // Paper - Fix commands from signs not firing command events
}
+
+ // Purpur start - Signs allow color codes

11
purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/DensityFunctions.java.patch
View File

@@ -1,11 +0,0 @@
--- a/net/minecraft/world/level/levelgen/DensityFunctions.java
+++ b/net/minecraft/world/level/levelgen/DensityFunctions.java
@@ -534,7 +_,7 @@
int i1 = z / 2;
int i2 = x % 2;
int i3 = z % 2;
- float f = 100.0F - Mth.sqrt((long)x * (long)x + (long)z * (long)z) * 8.0F; // Paper - cast ints to long to avoid integer overflow
+ float f = 100.0F - Mth.sqrt(org.purpurmc.purpur.PurpurConfig.generateEndVoidRings ? x * x + z * z : (long)x * (long)x + (long)z * (long)z) * 8.0F; // Paper - cast ints to long to avoid integer overflow // Purpur - Setting to reintroduce end void rings
f = Mth.clamp(f, -100.0F, 80.0F);
NoiseCache cache = noiseCache.get().computeIfAbsent(noise, noiseKey -> new NoiseCache()); // Paper - Perf: Optimize end generation

2
purpur-server/minecraft-patches/sources/net/minecraft/world/phys/AABB.java.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/phys/AABB.java
+++ b/net/minecraft/world/phys/AABB.java
@@ -475,4 +_,10 @@
@@ -474,4 +_,10 @@
return new AABB(this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ);
}
}