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

Fix various world casting errors

Browse Source
This commit is contained in:
William Blake Galbreath
2020-02-17 20:47:00 -06:00
parent 5edf392119
commit 9e073631de
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0011-Charged-creeper-naturally-spawn.patch
View File

@@ -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 <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 22:37:44 -0600 Date: Fri, 29 Nov 2019 22:37:44 -0600
Subject: [PATCH] Charged creeper naturally spawn Subject: [PATCH] Charged creeper naturally spawn
@@ -9,7 +9,7 @@ Subject: [PATCH] Charged creeper naturally spawn
2 files changed, 13 insertions(+) 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 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 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/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 { @@ -87,6 +87,17 @@ public class EntityCreeper extends EntityMonster {
@@ -19,7 +19,7 @@ index 48fd8e716..d414b848e 100644
+ // Purpur start + // Purpur start
+ @Override + @Override
+ public GroupDataEntity prepare(GeneratorAccess generatoraccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, GroupDataEntity groupdataentity, NBTTagCompound nbttagcompound) { + 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) { + if (chance > 0D && random.nextDouble() <= chance) {
+ setPowered(true); + setPowered(true);
+ } + }

6
patches/server/0071-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
View File

@@ -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 <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:20:45 -0500 Date: Sat, 19 Oct 2019 02:20:45 -0500
Subject: [PATCH] Add option to allow iron golems to spawn in air 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(-) 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 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 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
+++ b/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 { @@ -241,7 +241,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -17,7 +17,7 @@ index 5414d6975..e71a0af5c 100644
IBlockData iblockdata = iworldreader.getType(blockposition1); IBlockData iblockdata = iworldreader.getType(blockposition1);
- if (!iblockdata.a((IBlockAccess) iworldreader, blockposition1, (Entity) this)) { - 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; return false;
} else { } else {
for (int i = 1; i < 3; ++i) { for (int i = 1; i < 3; ++i) {

6
patches/server/0078-Implement-infinite-lava.patch
View File

@@ -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 <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 23 Nov 2019 17:55:42 -0600 Date: Sat, 23 Nov 2019 17:55:42 -0600
Subject: [PATCH] Implement infinite lava 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) { 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 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 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java
+++ b/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 { @@ -147,6 +147,13 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
@@ -49,7 +49,7 @@ index d25368d03..38b9ebaee 100644
+ // Purpur start + // Purpur start
+ @Override + @Override
+ protected boolean infinite(IWorldReader iworldreader) { + protected boolean infinite(IWorldReader iworldreader) {
+ return ((World) iworldreader).purpurConfig.lavaInfinite; + return iworldreader.getWorldProvider().getWorld().purpurConfig.lavaInfinite;
+ } + }
+ // Purpur end + // Purpur end
+ +

6
patches/server/0092-Make-lava-flow-speed-configurable.patch
View File

@@ -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 <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Jan 2020 11:31:36 -0600 Date: Thu, 2 Jan 2020 11:31:36 -0600
Subject: [PATCH] Make lava flow speed configurable 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(-) 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 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 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java
+++ b/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 { @@ -129,7 +129,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
@@ -18,7 +18,7 @@ index 38b9ebaee..4696d2c05 100644
@Override @Override
public int a(IWorldReader iworldreader) { public int a(IWorldReader iworldreader) {
- return iworldreader.getWorldProvider().g() ? 10 : 30; - 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 @Override