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

Remove some patches and fix natural spawn issues

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-28 09:45:50 -05:00
parent 8d221f9a1b
commit 7c81e88207
51 changed files with 175 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0013-Make-giants-naturally-spawn-and-have-AI.patch
View File

@@ -1,4 +1,4 @@
From b27bc98e22f0c21525465d23a6c0ef7e727a9d5e Mon Sep 17 00:00:00 2001
From 4f0ade4ca03aa897cb0667065159ac29297453fb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 00:43:12 -0500
Subject: [PATCH] Make giants naturally spawn and have AI
@@ -7,8 +7,9 @@ Subject: [PATCH] Make giants naturally spawn and have AI
.../java/net/minecraft/server/BiomeBase.java | 1 +
.../java/net/minecraft/server/Biomes.java | 25 ++++++++++++++++
.../minecraft/server/EntityGiantZombie.java | 30 +++++++++++++++++--
.../net/minecraft/server/SpawnerCreature.java | 8 +++++
.../java/net/pl3x/purpur/PurpurConfig.java | 7 +++++
4 files changed, 61 insertions(+), 2 deletions(-)
5 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
index a86ece8344..fbbb3b7c51 100644
@@ -101,6 +102,25 @@ index 29e7639ad6..e69e7a456d 100644
+ return super.a(blockposition, iworldreader); // Purpur - fix light requirements for natural spawns
}
}
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 5e6559df0b..2d4ea99f16 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -78,6 +78,14 @@ public final class SpawnerCreature {
if (biomebase_biomemeta.b.e() != EnumCreatureType.MISC && (biomebase_biomemeta.b.d() || d0 <= 16384.0D)) {
EntityTypes<?> entitytypes = biomebase_biomemeta.b;
+ // Purpur start
+ if (entitytypes == EntityTypes.GIANT) {
+ if (!net.pl3x.purpur.PurpurConfig.giantsNaturallySpawn) {
+ return amountSpawned;
+ }
+ }
+ // Purpur end
+
if (entitytypes.b() && a(chunkgenerator, enumcreaturetype, biomebase_biomemeta, (BlockPosition) blockposition_mutableblockposition)) {
EntityPositionTypes.Surface entitypositiontypes_surface = EntityPositionTypes.a(entitytypes);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 2b67041f45..ad807268c9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java