mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-18 16:45:42 +01:00
1c49ff69f4
The hell happened here. : Fix Build 2339ac14a8e Regen the patches 89d3fcbdfaf This new system breaks a lot :(
31 lines
1.6 KiB
Diff
31 lines
1.6 KiB
Diff
From b2b3c0115c12da106161b8f7c143bc77c2388430 Mon Sep 17 00:00:00 2001
|
|
From: Thinkofdeath <thethinkofdeath@gmail.com>
|
|
Date: Mon, 20 Jan 2014 20:42:28 +0000
|
|
Subject: [PATCH] Don't let trees replace any block.
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldGenForestTree.java b/src/main/java/net/minecraft/server/WorldGenForestTree.java
|
|
index 2653bd8..dd9e5b6 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldGenForestTree.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldGenForestTree.java
|
|
@@ -123,7 +123,15 @@ public class WorldGenForestTree extends WorldGenTreeAbstract {
|
|
int k2;
|
|
|
|
for (k2 = 0; k2 < j2; ++k2) {
|
|
- this.a(world, new BlockPosition(blockposition.getX() + l1, k1 - k2 - 1, blockposition.getZ() + i2), Blocks.LOG2, EnumLogVariant.DARK_OAK.a() - 4);
|
|
+ // Spigot start
|
|
+ BlockPosition position = new BlockPosition(blockposition.getX() + l1, k1 - k2 - 1, blockposition.getZ() + i2);
|
|
+ Block bl = world.getType(position).getBlock();
|
|
+
|
|
+ if (bl.getMaterial() == Material.AIR || bl.getMaterial() == Material.LEAVES)
|
|
+ {
|
|
+ this.a(world, position, Blocks.LOG2, EnumLogVariant.DARK_OAK.a() - 4);
|
|
+ }
|
|
+ // Spigot end
|
|
}
|
|
|
|
int l2;
|
|
--
|
|
2.1.0
|
|
|