Update to Minecraft 1.15

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions

View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/server/BlockPiston.java
+++ b/net/minecraft/server/BlockPiston.java
@@ -6,6 +6,14 @@
import java.util.List;
import java.util.Set;
@@ -7,6 +7,14 @@
import java.util.Map;
import java.util.Map.Entry;
+// CraftBukkit start
+import com.google.common.collect.ImmutableList;
@@ -15,7 +15,7 @@
public class BlockPiston extends BlockDirectional {
public static final BlockStateBoolean EXTENDED = BlockProperties.g;
@@ -112,6 +120,18 @@
@@ -113,6 +121,18 @@
}
}
@@ -31,13 +31,13 @@
+ }
+ // PAIL: checkME - what happened to setTypeAndData?
+ // CraftBukkit end
world.playBlockAction(blockposition, this, b0, enumdirection.a());
world.playBlockAction(blockposition, this, b0, enumdirection.b());
}
@@ -281,6 +301,48 @@
@@ -284,6 +304,48 @@
int j = list.size() + list2.size();
IBlockData[] aiblockdata = new IBlockData[j];
EnumDirection enumdirection1 = flag ? enumdirection : enumdirection.opposite();
Set<BlockPosition> set = Sets.newHashSet(list);
+ // CraftBukkit start
+ final org.bukkit.block.Block bblock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
+