diff --git a/patches/server/0011-Charged-creeper-naturally-spawn.patch b/patches/server/0011-Charged-creeper-naturally-spawn.patch index 517562dbf..bf688e9de 100644 --- a/patches/server/0011-Charged-creeper-naturally-spawn.patch +++ b/patches/server/0011-Charged-creeper-naturally-spawn.patch @@ -1,4 +1,4 @@ -From c95533f81d47bcc5299b59033211b8fc713be8bc Mon Sep 17 00:00:00 2001 +From 9b08732e96d8515675dcda20db5b2cee17f735ae Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 22:37:44 -0600 Subject: [PATCH] Charged creeper naturally spawn @@ -9,7 +9,7 @@ Subject: [PATCH] Charged creeper naturally spawn 2 files changed, 13 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 48fd8e716..d414b848e 100644 +index 48fd8e716..ce366f401 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -87,6 +87,17 @@ public class EntityCreeper extends EntityMonster { @@ -19,7 +19,7 @@ index 48fd8e716..d414b848e 100644 + // Purpur start + @Override + public GroupDataEntity prepare(GeneratorAccess generatoraccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, GroupDataEntity groupdataentity, NBTTagCompound nbttagcompound) { -+ double chance = ((World) generatoraccess).purpurConfig.creeperChargedChance; ++ double chance = generatoraccess.getMinecraftWorld().purpurConfig.creeperChargedChance; + if (chance > 0D && random.nextDouble() <= chance) { + setPowered(true); + } diff --git a/patches/server/0071-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0071-Add-option-to-allow-iron-golems-to-spawn-in-air.patch index 7d43be03a..5d2feb29a 100644 --- a/patches/server/0071-Add-option-to-allow-iron-golems-to-spawn-in-air.patch +++ b/patches/server/0071-Add-option-to-allow-iron-golems-to-spawn-in-air.patch @@ -1,4 +1,4 @@ -From 93a7c26419e0753954529826e3218844e3183a12 Mon Sep 17 00:00:00 2001 +From ecf3457139e931f164e3fa16ac9588591e897af2 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:20:45 -0500 Subject: [PATCH] Add option to allow iron golems to spawn in air @@ -9,7 +9,7 @@ Subject: [PATCH] Add option to allow iron golems to spawn in air 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java -index 5414d6975..e71a0af5c 100644 +index 5414d6975..91011dd0a 100644 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java @@ -241,7 +241,7 @@ public class EntityIronGolem extends EntityGolem { @@ -17,7 +17,7 @@ index 5414d6975..e71a0af5c 100644 IBlockData iblockdata = iworldreader.getType(blockposition1); - if (!iblockdata.a((IBlockAccess) iworldreader, blockposition1, (Entity) this)) { -+ if (!iblockdata.a((IBlockAccess) iworldreader, blockposition1, (Entity) this) && !((World) iworldreader).purpurConfig.ironGolemCanSpawnInAir) { // Purpur ++ if (!iblockdata.a((IBlockAccess) iworldreader, blockposition1, (Entity) this) && !iworldreader.getWorldProvider().getWorld().purpurConfig.ironGolemCanSpawnInAir) { // Purpur return false; } else { for (int i = 1; i < 3; ++i) { diff --git a/patches/server/0078-Implement-infinite-lava.patch b/patches/server/0078-Implement-infinite-lava.patch index ffe238341..4158c1533 100644 --- a/patches/server/0078-Implement-infinite-lava.patch +++ b/patches/server/0078-Implement-infinite-lava.patch @@ -1,4 +1,4 @@ -From e0161117ed31b278400832e6c8ae9aac67745a0a Mon Sep 17 00:00:00 2001 +From aee5d22400e2cdc6913fa51e7f549deac3c8bd5a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 23 Nov 2019 17:55:42 -0600 Subject: [PATCH] Implement infinite lava @@ -39,7 +39,7 @@ index 376dca188..1a14fe4a2 100644 protected void a(GeneratorAccess generatoraccess, BlockPosition blockposition, IBlockData iblockdata, EnumDirection enumdirection, Fluid fluid) { diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java -index d25368d03..38b9ebaee 100644 +index d25368d03..09f82c2d9 100644 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java @@ -147,6 +147,13 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { @@ -49,7 +49,7 @@ index d25368d03..38b9ebaee 100644 + // Purpur start + @Override + protected boolean infinite(IWorldReader iworldreader) { -+ return ((World) iworldreader).purpurConfig.lavaInfinite; ++ return iworldreader.getWorldProvider().getWorld().purpurConfig.lavaInfinite; + } + // Purpur end + diff --git a/patches/server/0092-Make-lava-flow-speed-configurable.patch b/patches/server/0092-Make-lava-flow-speed-configurable.patch index b0a35eef9..19d4ed18f 100644 --- a/patches/server/0092-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0092-Make-lava-flow-speed-configurable.patch @@ -1,4 +1,4 @@ -From 633383d64ba31158d3e010a539e224bede30ee56 Mon Sep 17 00:00:00 2001 +From ec0f6bb97f6c0bf7f404f4f5104552a904440057 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 11:31:36 -0600 Subject: [PATCH] Make lava flow speed configurable @@ -10,7 +10,7 @@ Subject: [PATCH] Make lava flow speed configurable 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java -index 38b9ebaee..4696d2c05 100644 +index 09f82c2d9..470e9bfd0 100644 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java @@ -129,7 +129,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { @@ -18,7 +18,7 @@ index 38b9ebaee..4696d2c05 100644 @Override public int a(IWorldReader iworldreader) { - return iworldreader.getWorldProvider().g() ? 10 : 30; -+ return iworldreader.getWorldProvider().isHell() ? ((World) iworldreader).purpurConfig.lavaSpeedNether : ((World) iworldreader).purpurConfig.lavaSpeedNotNether; // Purpur ++ return iworldreader.getWorldProvider().isHell() ? iworldreader.getWorldProvider().getWorld().purpurConfig.lavaSpeedNether : iworldreader.getWorldProvider().getWorld().purpurConfig.lavaSpeedNotNether; // Purpur } @Override