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

Update to Minecraft 1.14.3-pre4

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-06-21 20:00:00 +10:00
parent 0297d9de8a
commit a8155d2399
109 changed files with 660 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
View File

@@ -66,12 +66,12 @@ public class CraftCreeper extends CraftMonster implements Creeper {
@Override
public void explode() {
getHandle().eb();
getHandle().explode();
}
@Override
public void ignite() {
getHandle().dY(); // PAIL rename ignite
getHandle().ignite();
}
@Override

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java
View File

@@ -26,7 +26,7 @@ public class CraftHanging extends CraftEntity implements Hanging {
@Override
public boolean setFacingDirection(BlockFace face, boolean force) {
EntityHanging hanging = getHandle();
EnumDirection dir = hanging.direction;
EnumDirection dir = hanging.getDirection();
switch (face) {
case SOUTH:
default:
@@ -52,7 +52,7 @@ public class CraftHanging extends CraftEntity implements Hanging {
@Override
public BlockFace getFacing() {
EnumDirection direction = this.getHandle().direction;
EnumDirection direction = this.getHandle().getDirection();
if (direction == null) return BlockFace.SELF;
return CraftBlock.notchToBlockFace(direction);
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
View File

@@ -24,7 +24,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
@Override
public boolean setFacingDirection(BlockFace face, boolean force) {
EntityHanging hanging = getHandle();
EnumDirection oldDir = hanging.direction;
EnumDirection oldDir = hanging.getDirection();
EnumDirection newDir = CraftBlock.blockFaceToNotch(face);
getHandle().setDirection(newDir);

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
View File

@@ -34,11 +34,11 @@ public class CraftPainting extends CraftHanging implements Painting {
EntityPainting painting = this.getHandle();
Paintings oldArt = painting.art;
painting.art = CraftArt.BukkitToNotch(art);
painting.setDirection(painting.direction);
painting.setDirection(painting.getDirection());
if (!force && !painting.survives()) {
// Revert painting since it doesn't fit
painting.art = oldArt;
painting.setDirection(painting.direction);
painting.setDirection(painting.getDirection());
return false;
}
this.update();
@@ -60,7 +60,7 @@ public class CraftPainting extends CraftHanging implements Painting {
EntityPainting painting = EntityTypes.PAINTING.a(world);
painting.blockPosition = getHandle().blockPosition;
painting.art = getHandle().art;
painting.setDirection(getHandle().direction);
painting.setDirection(getHandle().getDirection());
getHandle().die();
getHandle().velocityChanged = true; // because this occurs when the painting is broken, so it might be important
world.addEntity(painting);

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java
View File

@@ -26,6 +26,8 @@ public final class CraftMemoryMapper {
return null;
} else if (object instanceof Location) {
return toNms((Location) object);
} else if (object instanceof Long) {
return object;
}
throw new UnsupportedOperationException("Do not know how to map " + object);