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 & Pufferfish)

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

Paper Changes:
PaperMC/Paper@c50fc3a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7480)

Pufferfish Changes:
pufferfish-gg/Pufferfish@81f546b Fix SIMD when pixel counts aren't divisible by 8
This commit is contained in:
BillyGalbreath
2022-02-15 10:47:49 -06:00
parent cfe8efe1f0
commit d413f6f631
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 2f8efdd72ee3ef12ce8223b73281f4170ad1bbf1..3fc111ee19000a9e665f00e168d1278cd5de0d25 100644
index 4fcc013883a7dbf58e4cf3972d43516cd51f8e7e..9ff1f59202fa359c01aa7f976866a8dfe5a41133 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -83,6 +83,7 @@ import net.minecraft.world.entity.MobCategory;
@@ -61,7 +61,7 @@ index 2f8efdd72ee3ef12ce8223b73281f4170ad1bbf1..3fc111ee19000a9e665f00e168d1278c
+ // Purpur end
// CraftBukkit start
this.serverLevelData = (PrimaryLevelData) iworlddataserver;
serverLevelData.world = this;
this.serverLevelData.setWorld(this);
diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
index 323eea2bccacfcc85849b5d82c2b30d991e0c0d8..bb5918ff947eb4cc4d0c964b2a8a9166c5745987 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
@@ -94,7 +94,7 @@ index 323eea2bccacfcc85849b5d82c2b30d991e0c0d8..bb5918ff947eb4cc4d0c964b2a8a9166
if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
blockposition1 = blockposition2;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8ff90ee18ed8a6d6c5be991a5a0841383dd93f6c..8063f1d20a6f505514c94a28b890488319ca5628 100644
index 2a226f91d7afe0489adb4dbe94d69e6fc8e6e4e4..923110da6494664fef30fd20a7d9282eaac825f9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -68,6 +68,12 @@ public class PurpurWorldConfig {