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

Update to Minecraft 1.8.3

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/nms-patches/BlockMushroom.patch
View File

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockMushroom.java 2014-11-28 17:43:42.925707439 +0000
+++ src/main/java/net/minecraft/server/BlockMushroom.java 2014-11-28 17:38:23.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/BlockMushroom.java 2015-02-26 22:40:22.183608144 +0000
+++ src/main/java/net/minecraft/server/BlockMushroom.java 2015-02-26 22:40:22.183608144 +0000
@@ -3,6 +3,12 @@
import java.util.Iterator;
import java.util.Random;
@@ -21,13 +21,11 @@
if (random.nextInt(25) == 0) {
int i = 5;
boolean flag = true;
@@ -39,8 +46,20 @@
blockposition2 = blockposition.a(random.nextInt(3) - 1, random.nextInt(2) - random.nextInt(2), random.nextInt(3) - 1);
@@ -40,7 +47,19 @@
}
- if (world.isEmpty(blockposition2) && this.f(world, blockposition2, this.getBlockData())) {
if (world.isEmpty(blockposition2) && this.f(world, blockposition2, this.getBlockData())) {
- world.setTypeAndData(blockposition2, this.getBlockData(), 2);
+ if (world.isEmpty(blockposition2) && this.f(world, blockposition2, this.getBlockData())) {
+ // CraftBukkit start
+ // world.setTypeAndData(blockposition2, this.getBlockData(), 2);
+ org.bukkit.World bworld = world.getWorld();
@@ -49,9 +47,9 @@
if (this == Blocks.BROWN_MUSHROOM) {
+ BlockSapling.treeType = TreeType.BROWN_MUSHROOM; // CraftBukkit
worldgenhugemushroom = new WorldGenHugeMushroom(0);
worldgenhugemushroom = new WorldGenHugeMushroom(Blocks.BROWN_MUSHROOM_BLOCK);
} else if (this == Blocks.RED_MUSHROOM) {
+ BlockSapling.treeType = TreeType.RED_MUSHROOM; // CraftBukkit
worldgenhugemushroom = new WorldGenHugeMushroom(1);
worldgenhugemushroom = new WorldGenHugeMushroom(Blocks.RED_MUSHROOM_BLOCK);
}