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

lets just put that back how we found it...

Browse Source
This commit is contained in:
William Blake Galbreath
2020-01-04 23:54:51 -06:00
parent 2cb9cfc26d
commit e6d938b84d
1 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/server/0097-Allow-beehives-to-generate-with-saplings.patch
View File

@@ -1,11 +1,10 @@
From d9ba80236c9cb9d62dcb87a5c0b644cfa68cd9f0 Mon Sep 17 00:00:00 2001 From 67f5e98a4b24b58ac41035495afc9301d1d5270e 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, 4 Jan 2020 11:41:38 -0600 Date: Sat, 4 Jan 2020 11:41:38 -0600
Subject: [PATCH] Allow beehives to generate with saplings Subject: [PATCH] Allow beehives to generate with saplings
--- ---
.../server/BiomeDecoratorGroups.java | 260 +++++++++--------- .../server/BiomeDecoratorGroups.java | 260 +++++++++---------
.../WorldGenFeatureStateProviderWeighted.java | 12 +-
.../server/WorldGenFeatureTreeBeehive.java | 8 +- .../server/WorldGenFeatureTreeBeehive.java | 8 +-
.../minecraft/server/WorldGenGroundBush.java | 10 +- .../minecraft/server/WorldGenGroundBush.java | 10 +-
.../server/WorldGenTreeAbstract.java | 6 + .../server/WorldGenTreeAbstract.java | 6 +
@@ -14,7 +13,7 @@ Subject: [PATCH] Allow beehives to generate with saplings
.../server/WorldGenTreeProviderOak.java | 33 ++- .../server/WorldGenTreeProviderOak.java | 33 ++-
.../net/minecraft/server/WorldGenerator.java | 7 +- .../net/minecraft/server/WorldGenerator.java | 7 +-
.../net/pl3x/purpur/PurpurWorldConfig.java | 5 + .../net/pl3x/purpur/PurpurWorldConfig.java | 5 +
10 files changed, 221 insertions(+), 146 deletions(-) 9 files changed, 212 insertions(+), 143 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BiomeDecoratorGroups.java b/src/main/java/net/minecraft/server/BiomeDecoratorGroups.java diff --git a/src/main/java/net/minecraft/server/BiomeDecoratorGroups.java b/src/main/java/net/minecraft/server/BiomeDecoratorGroups.java
index 8aabc14a53..13246e6cd1 100644 index 8aabc14a53..13246e6cd1 100644
@@ -497,29 +496,6 @@ index 8aabc14a53..13246e6cd1 100644
+ biomebase.a(WorldGenStage.Decoration.SURFACE_STRUCTURES, WorldGenerator.END_CITY.b(WorldGenFeatureConfiguration.e).a(WorldGenDecorator.a.a(WorldGenFeatureDecoratorConfiguration.e))); // Purpur - decompile error + biomebase.a(WorldGenStage.Decoration.SURFACE_STRUCTURES, WorldGenerator.END_CITY.b(WorldGenFeatureConfiguration.e).a(WorldGenDecorator.a.a(WorldGenFeatureDecoratorConfiguration.e))); // Purpur - decompile error
} }
} }
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
index e2af6d43b2..c886a06a3d 100644
--- a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
@@ -37,9 +37,15 @@ public class WorldGenFeatureStateProviderWeighted extends WorldGenFeatureStatePr
public synchronized <T> T a(DynamicOps<T> dynamicops) { // Paper
Builder<T, T> builder = ImmutableMap.builder();
- builder.put(dynamicops.createString("type"), dynamicops.createString(IRegistry.t.getKey(this.a).toString())).put(dynamicops.createString("entries"), this.b.a(dynamicops, (iblockdata) -> {
- return IBlockData.a(dynamicops, iblockdata);
- }));
+ builder.put(
+ dynamicops.createString("type"),
+ dynamicops.createString(IRegistry.t.getKey(this.a).toString())
+ ).put(
+ dynamicops.createString("entries"),
+ this.b.a(dynamicops, (iblockdata) -> {
+ return IBlockData.a(dynamicops, iblockdata);
+ })
+ );
return (new Dynamic<T>(dynamicops, dynamicops.createMap(builder.build()))).getValue(); // Paper - decompile fix
}
}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
index 4fbc53068f..0faaec95fd 100644 index 4fbc53068f..0faaec95fd 100644
--- a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java --- a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java