Update to Minecraft 1.14.2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-05-28 06:30:00 +10:00
parent 5f2275f40a
commit 569660215f
57 changed files with 385 additions and 394 deletions

View File

@@ -30,13 +30,10 @@ public final class CraftMemoryMapper {
}
public static Location fromNms(GlobalPos globalPos) {
// PAIL: globalPos.a() -> getDimensionManager()
// PAIL: globalPos.b() -> getBlockPosition()
return new org.bukkit.Location(((CraftServer) Bukkit.getServer()).getServer().getWorldServer(globalPos.a()).getWorld(), globalPos.b().getX(), globalPos.b().getY(), globalPos.b().getZ());
return new org.bukkit.Location(((CraftServer) Bukkit.getServer()).getServer().getWorldServer(globalPos.getDimensionManager()).getWorld(), globalPos.getBlockPosition().getX(), globalPos.getBlockPosition().getY(), globalPos.getBlockPosition().getZ());
}
public static GlobalPos toNms(Location location) {
// PAIL: GlobalPos.a(DmensionManager, BlockPosition) -> create()
return GlobalPos.a(((CraftWorld) location.getWorld()).getHandle().getWorldProvider().getDimensionManager(), new BlockPosition(location.getX(), location.getY(), location.getZ()));
return GlobalPos.create(((CraftWorld) location.getWorld()).getHandle().getWorldProvider().getDimensionManager(), new BlockPosition(location.getX(), location.getY(), location.getZ()));
}
}