From 515f6e4fb06525ac0ca85ed9bb4e2ee9a4ded016 Mon Sep 17 00:00:00 2001 From: CKATEPTb <33106029+CKATEPTb@users.noreply.github.com> Date: Sun, 22 Dec 2019 20:17:10 +0200 Subject: [PATCH] Minor bug fixes and poor support 1.13.2 (#63) * Fix bug with FactionsUUID on 1.12.2 * Fix dismount bug on hight speed * 1.13.2 support * Whoops, fixed broken check on entity registered --- .../phiwa/dragontravel/core/DragonTravel.java | 20 +- .../dragontravel/nms/v1_11_R1/RyeDragon.java | 6 +- .../dragontravel/nms/v1_12_R1/RyeDragon.java | 10 +- .../dragontravel/nms/v1_13_R1/RyeDragon.java | 6 +- .../nms/v1_13_R2/CustomEntityRegistry.java | 91 +++ .../nms/v1_13_R2/EntityRegister.java | 42 ++ .../dragontravel/nms/v1_13_R2/RyeDragon.java | 519 ++++++++++++++++++ 7 files changed, 674 insertions(+), 20 deletions(-) create mode 100644 src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/CustomEntityRegistry.java create mode 100644 src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/EntityRegister.java create mode 100644 src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/RyeDragon.java diff --git a/src/main/java/eu/phiwa/dragontravel/core/DragonTravel.java b/src/main/java/eu/phiwa/dragontravel/core/DragonTravel.java index ae25c1c..1345fa9 100644 --- a/src/main/java/eu/phiwa/dragontravel/core/DragonTravel.java +++ b/src/main/java/eu/phiwa/dragontravel/core/DragonTravel.java @@ -46,6 +46,7 @@ public class DragonTravel extends JavaPlugin { private CommandHelpTopic help; private IEntityRegister entityRegister; + private boolean isEntityRegistered; private PaymentManager paymentManager; private DragonManager dragonManager; private FlightEditor flightEditor; @@ -105,6 +106,14 @@ public void onLoad() { commands = new CustomCommandsManager(); final CommandsManagerRegistration cmdRegister = new CommandsManagerRegistration(this, commands); cmdRegister.register(DragonTravelCommands.DragonTravelParentCommand.class); + instance = this; + + nmsHandler = new NMSHandler(); + entityRegister = nmsHandler.getEntityRegister(); + dragonManager = DragonManager.getDragonManager(); + flightEditor = new FlightEditor(); + + isEntityRegistered = entityRegister.registerEntity(); } @Override @@ -122,15 +131,8 @@ public void onDisable() { @Override public void onEnable() { - instance = this; - - nmsHandler = new NMSHandler(); - entityRegister = nmsHandler.getEntityRegister(); - dragonManager = DragonManager.getDragonManager(); - flightEditor = new FlightEditor(); - - if (!entityRegister.registerEntity()) return; - + if (!isEntityRegistered) + return; setupListeners(); setupFileHandlers(); diff --git a/src/main/java/eu/phiwa/dragontravel/nms/v1_11_R1/RyeDragon.java b/src/main/java/eu/phiwa/dragontravel/nms/v1_11_R1/RyeDragon.java index 8eae0a0..bb12efe 100644 --- a/src/main/java/eu/phiwa/dragontravel/nms/v1_11_R1/RyeDragon.java +++ b/src/main/java/eu/phiwa/dragontravel/nms/v1_11_R1/RyeDragon.java @@ -198,11 +198,12 @@ public void travel() { double myX = locX; double myY = locY; double myZ = locZ; + double maxDiff = DragonTravel.getInstance().getConfigHandler().getSpeed() + 1; if (finalMove) { - if ((int) locY > (int) toLoc.getY()) + if ((int) locY > (int) toLoc.getY() + maxDiff) myY -= DragonTravel.getInstance().getConfigHandler().getSpeed(); - else if ((int) locY < (int) toLoc.getY()) + else if ((int) locY < (int) toLoc.getY() - maxDiff) myY += DragonTravel.getInstance().getConfigHandler().getSpeed(); else { if (!getEntity().getWorld().getName().equals(toLoc.getWorld().getName())) { @@ -251,7 +252,6 @@ else if (midLocB.getZ() > toLoc.getZ()) // For higher travel speeds the accuracy for dismounts needs // to be decreased to prevent dragons from getting stuck - double maxDiff = DragonTravel.getInstance().getConfigHandler().getSpeed() + 1; if (Math.abs(myZ - (int) toLoc.getZ()) <= maxDiff && Math.abs(myX - (int) toLoc.getX()) <= maxDiff) { finalMove = true; diff --git a/src/main/java/eu/phiwa/dragontravel/nms/v1_12_R1/RyeDragon.java b/src/main/java/eu/phiwa/dragontravel/nms/v1_12_R1/RyeDragon.java index b0a2fef..fd1c24b 100644 --- a/src/main/java/eu/phiwa/dragontravel/nms/v1_12_R1/RyeDragon.java +++ b/src/main/java/eu/phiwa/dragontravel/nms/v1_12_R1/RyeDragon.java @@ -203,13 +203,14 @@ public void travel() { double myX = locX; double myY = locY; double myZ = locZ; + double maxDiff = DragonTravel.getInstance().getConfigHandler().getSpeed() + 1; if (finalMove) { - // Go down to destination - if ((int) locY > (int) toLoc.getY()) + // Go down to destination + if ((int) locY > (int) toLoc.getY() + maxDiff) myY -= DragonTravel.getInstance().getConfigHandler().getSpeed(); - // Go up to destination - else if ((int) locY < (int) toLoc.getY()) + // Go up to destination + else if ((int) locY < (int) toLoc.getY() - maxDiff) myY += DragonTravel.getInstance().getConfigHandler().getSpeed(); // Reached destination else { @@ -265,7 +266,6 @@ else if (midLocB.getZ() > toLoc.getZ()) // For higher travel speeds the accuracy for dismounts needs // to be decreased to prevent dragons from getting stuck - double maxDiff = DragonTravel.getInstance().getConfigHandler().getSpeed() + 1; if (Math.abs(myZ - (int) toLoc.getZ()) <= maxDiff && Math.abs(myX - (int) toLoc.getX()) <= maxDiff) { finalMove = true; diff --git a/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R1/RyeDragon.java b/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R1/RyeDragon.java index 4a8a416..47f1159 100644 --- a/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R1/RyeDragon.java +++ b/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R1/RyeDragon.java @@ -204,13 +204,14 @@ public void travel() { double myX = locX; double myY = locY; double myZ = locZ; + double maxDiff = DragonTravel.getInstance().getConfigHandler().getSpeed() + 1; if (finalMove) { // Go down to destination - if ((int) locY > (int) toLoc.getY()) + if ((int) locY > (int) toLoc.getY() + maxDiff) myY -= DragonTravel.getInstance().getConfigHandler().getSpeed(); // Go up to destination - else if ((int) locY < (int) toLoc.getY()) + else if ((int) locY < (int) toLoc.getY() - maxDiff) myY += DragonTravel.getInstance().getConfigHandler().getSpeed(); // Reached destination else { @@ -266,7 +267,6 @@ else if (midLocB.getZ() > toLoc.getZ()) // For higher travel speeds the accuracy for dismounts needs // to be decreased to prevent dragons from getting stuck - double maxDiff = DragonTravel.getInstance().getConfigHandler().getSpeed() + 1; if (Math.abs(myZ - (int) toLoc.getZ()) <= maxDiff && Math.abs(myX - (int) toLoc.getX()) <= maxDiff) { finalMove = true; diff --git a/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/CustomEntityRegistry.java b/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/CustomEntityRegistry.java new file mode 100644 index 0000000..f12bf33 --- /dev/null +++ b/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/CustomEntityRegistry.java @@ -0,0 +1,91 @@ +package eu.phiwa.dragontravel.nms.v1_13_R2; + +import java.util.Iterator; +import java.util.Map; +import java.util.Random; +import java.util.Set; + +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import com.google.common.collect.Maps; + +import net.minecraft.server.v1_13_R2.EntityTypes; +import net.minecraft.server.v1_13_R2.MinecraftKey; +import net.minecraft.server.v1_13_R2.RegistryMaterials; + +@SuppressWarnings("rawtypes") +public class CustomEntityRegistry extends RegistryMaterials { + private final BiMap entities = HashBiMap.create(); + private final BiMap entityClasses = this.entities.inverse(); + private final Map entityIds = Maps.newHashMap(); + private final RegistryMaterials> wrapped; + + public CustomEntityRegistry(RegistryMaterials> original) { + this.wrapped = original; + } + + @Override + public int a(Object key) { + if (entityIds.containsKey(key)) { + return entityIds.get(key); + } + + return wrapped.a((EntityTypes) key); + } + + @Override + public Object a(Random paramRandom) { + return wrapped.a(paramRandom); + } + + @Override + public boolean c(MinecraftKey paramK) { + return wrapped.c(paramK); + } + + public EntityTypes findType(Class search) { + for (Object type : wrapped) { + if (((EntityTypes) type).c() == search) { + return (EntityTypes) type; + } + } + return null; + } + + @Override + public EntityTypes get(MinecraftKey key) { + if (entities.containsKey(key)) { + return entities.get(key); + } + + return wrapped.get(key); + } + + @Override + public MinecraftKey getKey(Object value) { + if (entityClasses.containsKey(value)) { + return entityClasses.get(value); + } + + return wrapped.getKey((EntityTypes) value); + } + + public RegistryMaterials> getWrapped() { + return wrapped; + } + + @Override + public Iterator iterator() { + return (Iterator) wrapped.iterator(); + } + + @Override + public Set keySet() { + return (Set) wrapped.keySet(); + } + + public void put(int entityId, MinecraftKey key, EntityTypes entityClass) { + entities.put(key, entityClass); + entityIds.put(entityClass, entityId); + } +} \ No newline at end of file diff --git a/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/EntityRegister.java b/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/EntityRegister.java new file mode 100644 index 0000000..a621c5c --- /dev/null +++ b/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/EntityRegister.java @@ -0,0 +1,42 @@ +package eu.phiwa.dragontravel.nms.v1_13_R2; + +import eu.phiwa.dragontravel.core.DragonTravel; +import eu.phiwa.dragontravel.core.hooks.server.IEntityRegister; +import net.minecraft.server.v1_13_R2.Entity; +import net.minecraft.server.v1_13_R2.EntityTypes; +import net.minecraft.server.v1_13_R2.MinecraftKey; +import org.bukkit.Bukkit; + +public class EntityRegister implements IEntityRegister { + private static CustomEntityRegistry ENTITY_REGISTRY; + + public void registerEntityClass(Class clazz) { + if (ENTITY_REGISTRY == null) + return; + + Class search = clazz; + while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) { + EntityTypes type = ENTITY_REGISTRY.findType(search); + MinecraftKey key = ENTITY_REGISTRY.getKey(type); + if (key == null) + continue; + int code = ENTITY_REGISTRY.a(type); + ENTITY_REGISTRY.put(code, key, type); + return; + } + throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString()); + } + + @Override + public boolean registerEntity() { + try { + registerEntityClass(RyeDragon.class); + return true; + } catch (Exception e) { + Bukkit.getLogger().info("[DragonTravel] [Error] Could not register the RyeDragon-entity!"); + e.printStackTrace(); + Bukkit.getPluginManager().disablePlugin(DragonTravel.getInstance()); + } + return false; + } +} diff --git a/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/RyeDragon.java b/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/RyeDragon.java new file mode 100644 index 0000000..3676de6 --- /dev/null +++ b/src/main/java/eu/phiwa/dragontravel/nms/v1_13_R2/RyeDragon.java @@ -0,0 +1,519 @@ +// Copy of v1_13_R1 +// TODO During the flight the dragon freezes (not always). +// The player need to rejoin to unfreeze self. +// I don't know why, sry. +package eu.phiwa.dragontravel.nms.v1_13_R2; + +import eu.phiwa.dragontravel.core.DragonTravel; +import eu.phiwa.dragontravel.core.hooks.server.IRyeDragon; +import eu.phiwa.dragontravel.core.movement.DragonType; +import eu.phiwa.dragontravel.core.movement.flight.Flight; +import net.minecraft.server.v1_13_R2.EntityEnderDragon; +import net.minecraft.server.v1_13_R2.World; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.craftbukkit.v1_13_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_13_R2.util.CraftChatMessage; +import org.bukkit.entity.Entity; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.material.MaterialData; +import org.bukkit.util.Vector; + +public class RyeDragon extends EntityEnderDragon implements IRyeDragon { + + private final int wingCoolDown = 10; + private final int travelY = DragonTravel.getInstance().getConfigHandler().getTravelHeight(); + + private DragonType dragonType = DragonType.STATIONARY; + + private Player rider; + + // Source location + private Location fromLoc; + + // Target location + private Location toLoc; + + // Flight + private Flight flight; + private int currentWayPointIndex; + + // Travel + private Location midLocA; // Middle location source world + private Location midLocB; // Middle location target world + private boolean finalMove = false; + + private double xPerTick; + private double yPerTick; + private double zPerTick; + + public RyeDragon(Location loc) { + this(loc, ((CraftWorld) loc.getWorld()).getHandle()); + } + + public RyeDragon(Location loc, World notchWorld) { + super(notchWorld); + setPosition(loc.getX(), loc.getY(), loc.getZ()); + yaw = loc.getYaw() + 180; + pitch = 0f; + while (yaw > 360) + yaw -= 360; + while (yaw < 0) + yaw += 360; + notchWorld.addEntity(this); + } + + public RyeDragon(World notchWorld) { + super(notchWorld); + } + + + /** + * This method is a natural method of the Enderdragon extended by the RyeDragon. + * It's fired when the dragon moves and fires the travel-method again to keep the dragon flying. + */ + @Override + public void tick() { + if (getEntity() != null && rider != null) { + if (getEntity().getPassenger() != null) { + //getEntity().setPassenger(rider); //TODO: Reenable + } + rider.teleport(getEntity()); + } + + if (midLocA != null || toLoc != null) { + Vector a = fromLoc.toVector(); + Vector b = midLocA != null ? midLocA.toVector() : toLoc.toVector(); + double distX = b.getX() - a.getX(); + double distY = b.getY() - a.getY(); + double distZ = b.getZ() - a.getZ(); + + //vector trig functions have to be in rads... + float yaw = 0f, pitch = (float) -Math.atan(distY / Math.sqrt(distX * distX + distZ * distZ)); + + if (distX != 0) { + if (distX < 0) { + yaw = (float) (1.5 * Math.PI); + } else { + yaw = (float) (0.5 * Math.PI); + } + yaw = yaw - (float) Math.atan(distZ / distX); + } else if (distZ < 0) { + yaw = (float) Math.PI; + } + //back to degrees + setYawPitch(-yaw * 180F / (float) Math.PI - 180F, pitch * 180F / (float) Math.PI - 180F); + } + + switch (dragonType) { + case LOC_TRAVEL: + case HOME_TRAVEL: + case FACTION_TRAVEL: + case PLAYER_TRAVEL: + case STATION_TRAVEL: + travel(); + break; + case MANNED_FLIGHT: + case TIMED_FLIGHT: + flight(); + break; + default: + break; + } + } + + /** + * Controls the dragon + */ + @Override + public void flight() { + if ((int) locX != flight.getWaypoints().get(currentWayPointIndex).getX()) + if (locX < flight.getWaypoints().get(currentWayPointIndex).getX()) + locX += xPerTick; + else + locX -= xPerTick; + if ((int) locY != flight.getWaypoints().get(currentWayPointIndex).getY()) + if ((int) locY < flight.getWaypoints().get(currentWayPointIndex).getY()) + locY += yPerTick; + else + locY -= yPerTick; + if ((int) locZ != flight.getWaypoints().get(currentWayPointIndex).getZ()) + if (locZ < flight.getWaypoints().get(currentWayPointIndex).getZ()) + locZ += zPerTick; + else + locZ -= zPerTick; + + if ((Math.abs((int) locZ - flight.getWaypoints().get(currentWayPointIndex).getZ()) <= 3) && Math.abs((int) locX - flight.getWaypoints().get(currentWayPointIndex).getX()) <= 3 && (Math.abs((int) locY - flight.getWaypoints().get(currentWayPointIndex).getY()) <= 5)) { + if (currentWayPointIndex == flight.getWaypoints().size() - 1) { + DragonTravel.getInstance().getDragonManager().removeRiderAndDragon(getEntity(), flight.getWaypoints().get(currentWayPointIndex).getAsLocation()); + return; + } + + this.currentWayPointIndex++; + + this.fromLoc = getEntity().getLocation(); + this.toLoc = flight.getWaypoints().get(currentWayPointIndex).getAsLocation(); + + if (!flight.getWaypoints().get(currentWayPointIndex).getWorldName().equals(this.getEntity().getWorld().getName())) { + this.teleportTo(flight.getWaypoints().get(currentWayPointIndex).getAsLocation(), true); + this.currentWayPointIndex++; + } + + setMoveFlight(); + } + } + + /** + * Sets the x,y,z move for each tick + */ + @Override + public void setMoveFlight() { + double distX = fromLoc.getX() - flight.getWaypoints().get(currentWayPointIndex).getX(); + double distY = fromLoc.getY() - flight.getWaypoints().get(currentWayPointIndex).getY(); + double distZ = fromLoc.getZ() - flight.getWaypoints().get(currentWayPointIndex).getZ(); + double tick = Math.sqrt((distX * distX) + (distY * distY) + + (distZ * distZ)) / DragonTravel.getInstance().getConfigHandler().getSpeed(); + this.xPerTick = Math.abs(distX) / tick; + this.yPerTick = Math.abs(distY) / tick; + this.zPerTick = Math.abs(distZ) / tick; + } + + /** + * Starts the specified flight + * + * @param flight Flight to start + */ + @Override + public void startFlight(Flight flight, DragonType dragonType) { + this.flight = flight; + this.currentWayPointIndex = 0; + this.dragonType = dragonType; + + this.toLoc = flight.getWaypoints().get(currentWayPointIndex).getAsLocation(); + this.fromLoc = getEntity().getLocation(); + + setMoveFlight(); + } + + /** + * Normal Travel + */ + @Override + public void travel() { + if (getEntity().getPassenger() == null) + return; + + double myX = locX; + double myY = locY; + double myZ = locZ; + double maxDiff = DragonTravel.getInstance().getConfigHandler().getSpeed() + 1; + + if (finalMove) { + // Go down to destination + if ((int) locY > (int) toLoc.getY() + maxDiff) + myY -= DragonTravel.getInstance().getConfigHandler().getSpeed(); + // Go up to destination + else if ((int) locY < (int) toLoc.getY() - maxDiff) + myY += DragonTravel.getInstance().getConfigHandler().getSpeed(); + // Reached destination + else { + // Interworld travel, dragon reached temporary destination in target world + if (!getEntity().getWorld().getName().equals(toLoc.getWorld().getName())) { + this.rider = (Player) getEntity().getPassenger(); + midLocB.getChunk().load(); + + Bukkit.getScheduler().runTaskLater(DragonTravel.getInstance(), new Runnable() { + @Override + public void run() { + DragonTravel.getInstance().getDragonManager().dismount(rider, true); + if (midLocB.getZ() < toLoc.getZ()) + midLocB.setYaw((float) (-Math.toDegrees(Math.atan((midLocB.getX() - toLoc.getX()) / (midLocB.getZ() - toLoc.getZ()))))); + else if (midLocB.getZ() > toLoc.getZ()) + midLocB.setYaw((float) (-Math.toDegrees(Math.atan((midLocB.getX() - toLoc.getX()) / (midLocB.getZ() - toLoc.getZ())))) + 180.0F); + rider.teleport(midLocB); + if (!DragonTravel.getInstance().getDragonManager().mount(rider, false, dragonType)) + return; + if (!DragonTravel.getInstance().getDragonManager().getRiderDragons().containsKey(rider)) + return; + IRyeDragon dragon = DragonTravel.getInstance().getDragonManager().getRiderDragons().get(rider); + dragon.startTravel(toLoc, false, dragonType); + getEntity().remove(); + } + }, 1L); + } + // Dragon reached final destination + else { + DragonTravel.getInstance().getDragonManager().removeRiderAndDragon(getEntity(), true); + return; + } + } + + // Move player to new location on tick + setPosition(myX, myY, myZ); + + return; + } + + if ((int) locY < travelY) + myY += DragonTravel.getInstance().getConfigHandler().getSpeed(); + + if (myX < toLoc.getX()) + myX += xPerTick; + else + myX -= xPerTick; + + if (myZ < toLoc.getZ()) + myZ += zPerTick; + else + myZ -= zPerTick; + + // For higher travel speeds the accuracy for dismounts needs + // to be decreased to prevent dragons from getting stuck + if (Math.abs(myZ - (int) toLoc.getZ()) <= maxDiff + && Math.abs(myX - (int) toLoc.getX()) <= maxDiff) { + finalMove = true; + } + setPosition(myX, myY, myZ); + } + + /** + * Sets the x,z move for each tick + */ + @Override + public void setMoveTravel() { + double dist; + double distX; + double distY; + double distZ; + if (midLocA != null) { + dist = fromLoc.distance(midLocA); + distX = fromLoc.getX() - midLocA.getX(); + distY = fromLoc.getY() - midLocA.getY(); + distZ = fromLoc.getZ() - midLocA.getZ(); + } else { + dist = fromLoc.distance(toLoc); + distX = fromLoc.getX() - toLoc.getX(); + distY = fromLoc.getY() - toLoc.getY(); + distZ = fromLoc.getZ() - toLoc.getZ(); + } + double tick = dist / DragonTravel.getInstance().getConfigHandler().getSpeed(); + xPerTick = Math.abs(distX) / tick; + zPerTick = Math.abs(distZ) / tick; + yPerTick = Math.abs(distY) / tick; + } + + /** + * Starts a travel to the specified location + * + * @param destLoc Location to start a travel to + */ + @Override + public void startTravel(Location destLoc, boolean interWorld, DragonType dragonType) { + this.dragonType = dragonType; + this.rider = (Player) getEntity().getPassenger(); + this.fromLoc = getEntity().getLocation(); + if (interWorld) { + this.midLocA = new Location(getEntity().getWorld(), locX + 50 + Math.random() * 100, travelY, locZ + 50 + Math.random() * 100); + int scatter = 80; + this.midLocB = destLoc.clone().add(scatter, scatter, scatter); + this.toLoc = destLoc; + } else { + this.toLoc = destLoc; + } + setMoveTravel(); + } + + @Override + public DragonType getDragonType() { + return dragonType; + } + + @Override + public Entity getEntity() { + if (bukkitEntity != null) + return bukkitEntity; + return null; + } + + /* + public double x_() { + return 3; + } + */ + + public void fixWings() { + if (rider != null) + ((LivingEntity) getEntity()).damage(2, rider); + Bukkit.getScheduler().runTaskLater(DragonTravel.getInstance(), new Runnable() { + @Override + public void run() { + if (dragonType.equals(DragonType.STATIONARY)) { + WingFixerTask wfTask = new WingFixerTask(); + wfTask.setId(Bukkit.getScheduler().scheduleSyncRepeatingTask(DragonTravel.getInstance(), wfTask, 1L, 21L)); + } + } + }, 1L); + + } + + public void setDragonType(DragonType dragonType) { + this.dragonType = dragonType; + } + + public int getWingCoolDown() { + return wingCoolDown; + } + + public Player getRider() { + return rider; + } + + public void setRider(Player rider) { + this.rider = rider; + } + + public Flight getFlight() { + return flight; + } + + public void setFlight(Flight flight) { + this.flight = flight; + } + + public int getCurrentWayPointIndex() { + return currentWayPointIndex; + } + + public void setCurrentWayPointIndex(int currentWayPointIndex) { + this.currentWayPointIndex = currentWayPointIndex; + } + + public boolean isFinalMove() { + return finalMove; + } + + public void setFinalMove(boolean finalMove) { + this.finalMove = finalMove; + } + + public int getTravelY() { + return travelY; + } + + public double getxPerTick() { + return xPerTick; + } + + public void setxPerTick(double xPerTick) { + this.xPerTick = xPerTick; + } + + public double getyPerTick() { + return yPerTick; + } + + public void setyPerTick(double yPerTick) { + this.yPerTick = yPerTick; + } + + public double getzPerTick() { + return zPerTick; + } + + public void setzPerTick(double zPerTick) { + this.zPerTick = zPerTick; + } + + private class WingFixerTask implements Runnable { + + private int id; + private int cooldown; + + public void setId(int id) { + this.id = id; + this.cooldown = wingCoolDown; + } + + @Override + public void run() { + cooldown -= 1; + if (cooldown <= 0) + Bukkit.getScheduler().cancelTask(id); + final Location loc = getEntity().getLocation().add(0, 2, 0); + final Material m[] = new Material[15]; + final MaterialData md[] = new MaterialData[15]; + + int counter = 0; + for (int y = 0; y <= 2; y++) { + for (int x = -1; x <= 1; x++) { + m[counter] = loc.clone().add(x, -y, 0).getBlock().getType(); + md[counter] = loc.clone().add(x, -y, 0).getBlock().getState().getData(); + loc.clone().add(x, -y, 0).getBlock().setType(Material.BARRIER); + counter++; + } + for (int z = -1; z <= 1; z++) { + if (z == 0) continue; + m[counter] = loc.clone().add(0, -y, z).getBlock().getType(); + md[counter] = loc.clone().add(0, -y, z).getBlock().getState().getData(); + loc.clone().add(0, -y, z).getBlock().setType(Material.BARRIER); + counter++; + } + if (y == 0) { + loc.getBlock().setType(Material.WATER); + } + if (y == 1) { + loc.clone().add(0, -1, 0).getBlock().setType(Material.AIR); + } + } + + Bukkit.getScheduler().runTaskLater(DragonTravel.getInstance(), new Runnable() { + @Override + public void run() { + int count = 0; + for (int y = 0; y <= 2; y++) { + for (int x = -1; x <= 1; x++) { + loc.clone().add(x, -y, 0).getBlock().setType(m[count]); + loc.clone().add(x, -y, 0).getBlock().getState().setData(md[count]); + count++; + } + for (int z = -1; z <= 1; z++) { + if (z == 0) continue; + loc.clone().add(0, -y, z).getBlock().setType(m[count]); + loc.clone().add(0, -y, z).getBlock().getState().setData(md[count]); + count++; + } + } + } + }, 20L); + } + } + + // Old (until CB 1_12_R1), now only a compatibility-wrapper for our code + public void setCustomDragonName(String name) { + net.minecraft.server.v1_13_R2.IChatBaseComponent nameInNewType = CraftChatMessage.fromString(name)[0]; // convert from "name" + + // Call new method + setCustomName(nameInNewType); + } + + // New (in CB 1_13_R1) + public void setCustomName(net.minecraft.server.v1_13_R2.IChatBaseComponent name) { + super.setCustomName(name); + } + + // Old (until CB 1_12_R1), now only a compatibility-wrapper for our code + public String getCustomDragonName() { + // Call new method + net.minecraft.server.v1_13_R2.IChatBaseComponent nameInNewType = getCustomName(); + String nameAsString = CraftChatMessage.fromComponent(nameInNewType); // convert from "nameInNewType" + return nameAsString; + } + + // New (in CB 1_13_R1) + public net.minecraft.server.v1_13_R2.IChatBaseComponent getCustomName() { + return super.getCustomName(); + } + +}