Patch rebuild

This commit is contained in:
Zach Brown
2015-06-27 01:18:29 -05:00
parent 5d7c5da500
commit 929b5b0452
3 changed files with 15 additions and 15 deletions

View File

@@ -1,4 +1,4 @@
From bf4c75294ad48d09f70b5bc21e6489cb5912edd3 Mon Sep 17 00:00:00 2001
From ff43f17197527991ea1a261b7137e23c4dbe087d Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Fri, 17 Apr 2015 02:26:14 -0700
Subject: [PATCH] Add FallingBlock source location API
@@ -96,10 +96,10 @@ index 5931e1d..44219cd 100644
public void a(boolean flag) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 713a7c0..cba342b 100644
index a5de9aa..ce10832 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -889,7 +889,10 @@ public class CraftWorld implements World {
@@ -886,7 +886,10 @@ public class CraftWorld implements World {
double y = location.getBlockY() + 0.5;
double z = location.getBlockZ() + 0.5;
@@ -111,7 +111,7 @@ index 713a7c0..cba342b 100644
entity.ticksLived = 1;
world.addEntity(entity, SpawnReason.CUSTOM);
@@ -924,8 +927,10 @@ public class CraftWorld implements World {
@@ -921,8 +924,10 @@ public class CraftWorld implements World {
IBlockData blockData = world.getType(new BlockPosition(x, y, z));
int type = CraftMagicNumbers.getId(blockData.getBlock());
int data = blockData.getBlock().toLegacyData(blockData);
@@ -141,5 +141,5 @@ index 788f26b..f2dfedd 100644
+ // PaperSpigot end
}
--
2.4.3.windows.1
2.4.4.windows.2