SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.18.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2022-03-01 02:00:00 +11:00
parent bd40300a4f
commit 9ee989ea81
184 changed files with 1785 additions and 1785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/nms-patches/net/minecraft/world/level/block/grower/WorldGenMegaTreeProvider.patch
View File

@@ -1,10 +1,10 @@
--- a/net/minecraft/world/level/block/grower/WorldGenMegaTreeProvider.java
+++ b/net/minecraft/world/level/block/grower/WorldGenMegaTreeProvider.java
@@ -37,6 +37,7 @@
if (worldgenfeatureconfigured == null) {
@@ -38,6 +38,7 @@
if (holder == null) {
return false;
} else {
+ setTreeType(worldgenfeatureconfigured); // CraftBukkit
+ setTreeType(holder); // CraftBukkit
WorldGenFeatureConfigured<?, ?> worldgenfeatureconfigured = (WorldGenFeatureConfigured) holder.value();
IBlockData iblockdata1 = Blocks.AIR.defaultBlockState();
worldserver.setBlock(blockposition.offset(i, 0, j), iblockdata1, 4);

12
paper-server/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch
View File

@@ -14,20 +14,20 @@
public WorldGenTreeProvider() {}
@@ -26,6 +32,7 @@
if (worldgenfeatureconfigured == null) {
if (holder == null) {
return false;
} else {
+ setTreeType(worldgenfeatureconfigured); // CraftBukkit
+ setTreeType(holder); // CraftBukkit
WorldGenFeatureConfigured<?, ?> worldgenfeatureconfigured = (WorldGenFeatureConfigured) holder.value();
worldserver.setBlock(blockposition, Blocks.AIR.defaultBlockState(), 4);
if (worldgenfeatureconfigured.place(worldserver, chunkgenerator, random, blockposition)) {
return true;
@@ -51,4 +58,48 @@
@@ -53,4 +60,48 @@
return true;
}
+
+ // CraftBukkit start
+ protected void setTreeType(WorldGenFeatureConfigured<?, ?> worldgentreeabstract) {
+ protected void setTreeType(Holder<? extends WorldGenFeatureConfigured<?, ?>> worldgentreeabstract) {
+ if (worldgentreeabstract == TreeFeatures.OAK || worldgentreeabstract == TreeFeatures.OAK_BEES_005) {
+ BlockSapling.treeType = TreeType.TREE;
+ } else if (worldgentreeabstract == TreeFeatures.HUGE_RED_MUSHROOM) {