Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57:43 +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@1c779c2 Update to 1.18.1 (#7076)
PaperMC/Paper@901fd94 [ci skip] Update README
This commit is contained in:
Encode42
2021-12-10 16:04:19 -05:00
parent 26e5f080f2
commit 1fd37bdec4
26 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,10 +6,10 @@ 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 963c249f2bcf2a264c9e4cd0961f11bb08f54d12..7c84f20ce15525c4b8af4f03e3d67af08f8e1a03 100644
index ba095685ec775cb5a7ac9a5b7b0a91797f87b087..e0d2446a3e203a8980f2b4a8d45f677f5d7a7698 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -81,6 +81,7 @@ import net.minecraft.world.entity.MobCategory;
@@ -83,6 +83,7 @@ import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.entity.ReputationEventHandler;
import net.minecraft.world.entity.ai.navigation.PathNavigation;
import net.minecraft.world.entity.ai.village.ReputationEventType;
@@ -17,7 +17,7 @@ index 963c249f2bcf2a264c9e4cd0961f11bb08f54d12..7c84f20ce15525c4b8af4f03e3d67af0
import net.minecraft.world.entity.ai.village.poi.PoiManager;
import net.minecraft.world.entity.ai.village.poi.PoiType;
import net.minecraft.world.entity.animal.Animal;
@@ -88,7 +89,9 @@ import net.minecraft.world.entity.animal.WaterAnimal;
@@ -90,7 +91,9 @@ import net.minecraft.world.entity.animal.WaterAnimal;
import net.minecraft.world.entity.animal.horse.SkeletonHorse;
import net.minecraft.world.entity.boss.EnderDragonPart;
import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
@@ -27,7 +27,7 @@ index 963c249f2bcf2a264c9e4cd0961f11bb08f54d12..7c84f20ce15525c4b8af4f03e3d67af0
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.raid.Raid;
import net.minecraft.world.entity.raid.Raids;
@@ -127,6 +130,8 @@ import net.minecraft.world.level.gameevent.GameEvent;
@@ -129,6 +132,8 @@ import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraft.world.level.gameevent.GameEventListenerRegistrar;
import net.minecraft.world.level.gameevent.vibrations.VibrationPath;
import net.minecraft.world.level.levelgen.Heightmap;
@@ -36,7 +36,7 @@ index 963c249f2bcf2a264c9e4cd0961f11bb08f54d12..7c84f20ce15525c4b8af4f03e3d67af0
import net.minecraft.world.level.levelgen.feature.StructureFeature;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.level.levelgen.structure.StructureCheck;
@@ -493,7 +498,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -496,7 +501,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.dragonParts = new Int2ObjectOpenHashMap();
this.tickTime = flag1;
this.server = minecraftserver;
@@ -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 6f8dcbaf5bd02b6ce1e613e69b51e29a1c891867..2a140b22698de57254978178cd5609bf6b63fb5d 100644
index 60a56e14f11d064c1f24bfba2438d32444bf55ca..4d58a0e5911478e51d8046e3abf222694eab6b4c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -73,6 +73,12 @@ public class PurpurWorldConfig {