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

Update to Minecraft 1.16.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
paper-server/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java
View File

@@ -19,7 +19,7 @@ public class CraftDragonBattle implements DragonBattle {
@Override
public EnderDragon getEnderDragon() {
Entity entity = handle.d.getEntity(handle.m);
Entity entity = handle.world.getEntity(handle.dragonUUID);
return (entity != null) ? (EnderDragon) entity.getBukkitEntity() : null;
}
@@ -30,39 +30,39 @@ public class CraftDragonBattle implements DragonBattle {
@Override
public Location getEndPortalLocation() {
return new Location(handle.d.getWorld(), handle.o.getX(), handle.o.getY(), handle.o.getZ());
return new Location(handle.world.getWorld(), handle.exitPortalLocation.getX(), handle.exitPortalLocation.getY(), handle.exitPortalLocation.getZ());
}
@Override
public boolean hasBeenPreviouslyKilled() {
return handle.d(); // PAIL rename hasBeenPreviouslyKilled
return handle.isPreviouslyKilled();
}
@Override
public void initiateRespawn() {
this.handle.e(); // PAIL rename initiateRespawn
this.handle.initiateRespawn();
}
@Override
public RespawnPhase getRespawnPhase() {
return toBukkitRespawnPhase(handle.p);
return toBukkitRespawnPhase(handle.respawnPhase);
}
@Override
public boolean setRespawnPhase(RespawnPhase phase) {
Preconditions.checkArgument(phase != null && phase != RespawnPhase.NONE, "Invalid respawn phase provided: %s", phase);
if (handle.p == null) {
if (handle.respawnPhase == null) {
return false;
}
this.handle.a(toNMSRespawnPhase(phase));
this.handle.setRespawnPhase(toNMSRespawnPhase(phase));
return true;
}
@Override
public void resetCrystals() {
this.handle.f(); // PAIL rename resetCrystals
this.handle.resetCrystals();
}
@Override