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

Update to 1.12-pre6

Browse Source
This commit is contained in:
Shane Freeder
2017-05-31 09:04:52 +01:00
parent 529a9626f4
commit 9cf2e3b3dc
38 changed files with 79 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/Fix-FallingBlocks-being-stuck-on-fences.patch
View File

@@ -25,7 +25,7 @@ index d2a542354..c74071eb1 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/BlockFalling.java b/src/main/java/net/minecraft/server/BlockFalling.java
index db5c0deae..9bcfc336f 100644
index 674395756..1086e3117 100644
--- a/src/main/java/net/minecraft/server/BlockFalling.java
+++ b/src/main/java/net/minecraft/server/BlockFalling.java
@@ -0,0 +0,0 @@ public class BlockFalling extends Block {
@@ -34,7 +34,7 @@ index db5c0deae..9bcfc336f 100644
+ // Paper start - OBFHELPER
+ public static boolean canMoveThrough(IBlockData blockdata) {
+ return BlockFalling.i(blockdata);
+ return BlockFalling.x(blockdata);
+ }
+ // Paper end
+
@@ -42,7 +42,7 @@ index db5c0deae..9bcfc336f 100644
public void a_(World world, BlockPosition blockposition) {}
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
index 18e7cf2ad..6a22dce51 100644
index 70a196461..3c7bdccc4 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -0,0 +0,0 @@ package net.minecraft.server;
@@ -54,10 +54,12 @@ index 18e7cf2ad..6a22dce51 100644
import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
@@ -0,0 +0,0 @@ public class EntityFallingBlock extends Entity {
}
} else {
IBlockData iblockdata = this.world.getType(blockposition);
- if (!flag1 && BlockFalling.i(this.world.getType(new BlockPosition(this.locX, this.locY - 0.009999999776482582D, this.locZ)))) {
-
- if (!flag1 && BlockFalling.x(this.world.getType(new BlockPosition(this.locX, this.locY - 0.009999999776482582D, this.locZ)))) {
+
+ if (!isOnGround()) {
this.onGround = false;
- // return; // CraftBukkit