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

Remove 'Normalize spaces on when reading a chat packet' as it was fixed upstream

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
Spigot
2014-05-14 14:05:42 +01:00
parent 51faa817d1
commit b86bbe69d4
41 changed files with 43 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
CraftBukkit-Patches/0139-Don-t-let-trees-replace-any-block.patch Normal file
View File

@@ -0,0 +1,27 @@
From b19714fdfdca0f8cb4db05bf7ad94114fe414410 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 63c5af6..a758179 100644
--- a/src/main/java/net/minecraft/server/WorldGenForestTree.java
+++ b/src/main/java/net/minecraft/server/WorldGenForestTree.java
@@ -124,7 +124,12 @@ public class WorldGenForestTree extends WorldGenTreeAbstract {
int k3;
for (k3 = 0; k3 < j3; ++k3) {
- this.setTypeAndData(world, i + l2, k2 - k3 - 1, k + i3, Blocks.LOG2, 1);
+ Block block = world.getType(i + l2, k2 - k3 - 1, k + i3);
+
+ if (block.getMaterial() == Material.AIR || block.getMaterial() == Material.LEAVES)
+ {
+ this.setTypeAndData(world, i + l2, k2 - k3 - 1, k + i3, Blocks.LOG2, 1);
+ }
}
int l3;
--
1.9.1