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

Drop projectile despawn rates patch in favor of pufferfish's

Browse Source 
Fixes elBukkit/MagicPlugin#1042
Fixes elBukkit/MagicPlugin#816
This commit is contained in:
BillyGalbreath
2022-06-13 10:46:27 -05:00
parent c5dbf9cf10
commit 146750b2de
193 changed files with 978 additions and 1244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0098-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 1140edb12dba385ff572b2cd2ab1a4b32eab2a1a..ea71f71918c19d03f584939d17901d2ffff7ad0e 100644
index 1952608dc00f3d47aa6fe3dfd54957ca064a9374..fe4909978c6b81f87a4585c8b42c1b71bf638830 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -505,7 +505,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -67,10 +67,10 @@ index daa7c4bd8a3f6c28f02b7117b061f0def29e3743..d4699d7eefafffd2d4e0a03d62d5094f
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 88b49ee7171c0ad7be83eeac2aba2573e9707e4f..35529a02afe42607ebcd6ab532324561429ab14a 100644
index c32a57542363aeebde4cb1d43b1a460d6fa6b98c..80d1beff9f66619c37c992072a7046b6f4614f12 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 {
@@ -71,6 +71,12 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path));
}
@@ -83,7 +83,7 @@ index 88b49ee7171c0ad7be83eeac2aba2573e9707e4f..35529a02afe42607ebcd6ab532324561
private double getDouble(String path, double def) {
PurpurConfig.config.addDefault("world-settings.default." + path, def);
return PurpurConfig.config.getDouble("world-settings." + worldName + "." + path, PurpurConfig.config.getDouble("world-settings.default." + path));
@@ -236,6 +242,21 @@ public class PurpurWorldConfig {
@@ -239,6 +245,21 @@ public class PurpurWorldConfig {
}
}