From 956899cb6735a5217f737c400ad225dbb0483f10 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Fri, 17 Apr 2015 16:39:45 +1000 Subject: [PATCH] Fixeds #276 --- PlotSquared/pom.xml | 2 +- .../plot/database/SQLManager.java | 17 ++-- .../plot/object/entity/ArmorStandStats.java | 15 +++ .../plot/object/entity/EntityWrapper.java | 91 +++++++++++++++++++ 4 files changed, 116 insertions(+), 9 deletions(-) create mode 100644 PlotSquared/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml index fd3477722..2e2e4be89 100644 --- a/PlotSquared/pom.xml +++ b/PlotSquared/pom.xml @@ -8,7 +8,7 @@ UTF-8 PlotSquared - 2.9.13 + 2.9.15 PlotSquared jar diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java index 1fc0388ec..748a8d5ae 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java @@ -586,18 +586,11 @@ public class SQLManager implements AbstractDB { final DatabaseMetaData data = this.connection.getMetaData(); ResultSet rs = data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id"); if (rs.next()) { + rs.close(); rs = data.getColumns(null, null, this.prefix + "plot_comments", "hashcode"); if (!rs.next()) { rs.close(); try { - final Statement statement = this.connection.createStatement(); - statement.addBatch("ALTER IGNORE TABLE `" + this.prefix + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`"); - statement.addBatch("ALTER IGNORE TABLE `" + this.prefix + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0"); - statement.addBatch("ALTER TABLE `" + this.prefix + "plot` DROP `tier`"); - statement.executeBatch(); - statement.close(); - } - catch (SQLException e) { final Statement statement = this.connection.createStatement(); statement.addBatch("DROP TABLE `" + this.prefix + "plot_comments`"); if (PlotSquared.getMySQL() != null) { @@ -609,6 +602,14 @@ public class SQLManager implements AbstractDB { statement.executeBatch(); statement.close(); } + catch (SQLException e) { + final Statement statement = this.connection.createStatement(); + statement.addBatch("ALTER IGNORE TABLE `" + this.prefix + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`"); + statement.addBatch("ALTER IGNORE TABLE `" + this.prefix + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0"); + statement.addBatch("ALTER TABLE `" + this.prefix + "plot` DROP `tier`"); + statement.executeBatch(); + statement.close(); + } } } rs.close(); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java new file mode 100644 index 000000000..35b78e539 --- /dev/null +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java @@ -0,0 +1,15 @@ +package com.intellectualcrafters.plot.object.entity; + +public class ArmorStandStats { + float[] head = new float[3]; + float[] body = new float[3]; + float[] leftLeg = new float[3]; + float[] rightLeg = new float[3]; + float[] leftArm = new float[3]; + float[] rightArm = new float[3]; + public boolean noarms; + public boolean noplate; + public boolean nogravity; + public boolean invisible; + public boolean small; +} diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/entity/EntityWrapper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/entity/EntityWrapper.java index cf42da852..e2711689b 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/entity/EntityWrapper.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/entity/EntityWrapper.java @@ -28,6 +28,7 @@ import org.bukkit.entity.Tameable; import org.bukkit.inventory.EntityEquipment; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; +import org.bukkit.util.EulerAngle; import org.bukkit.util.Vector; import com.intellectualcrafters.plot.PlotSquared; @@ -51,6 +52,7 @@ public class EntityWrapper { public AgeableStats aged; public TameableStats tamed; private HorseStats horse; + private ArmorStandStats stand; public void storeInventory(final InventoryHolder held) { this.inventory = held.getInventory().getContents().clone(); @@ -317,6 +319,56 @@ public class EntityWrapper { final ArmorStand stand = (ArmorStand) entity; this.inventory = new ItemStack[] { stand.getItemInHand().clone(), stand.getHelmet().clone(), stand.getChestplate().clone(), stand.getLeggings().clone(), stand.getBoots().clone() }; storeLiving((LivingEntity) entity); + this.stand = new ArmorStandStats(); + + EulerAngle head = stand.getHeadPose(); + this.stand.head[0] = (float) head.getX(); + this.stand.head[1] = (float) head.getY(); + this.stand.head[2] = (float) head.getZ(); + + EulerAngle body = stand.getBodyPose(); + this.stand.body[0] = (float) body.getX(); + this.stand.body[1] = (float) body.getY(); + this.stand.body[2] = (float) body.getZ(); + + EulerAngle leftLeg = stand.getLeftLegPose(); + this.stand.leftLeg[0] = (float) leftLeg.getX(); + this.stand.leftLeg[1] = (float) leftLeg.getY(); + this.stand.leftLeg[2] = (float) leftLeg.getZ(); + + EulerAngle rightLeg = stand.getRightLegPose(); + this.stand.rightLeg[0] = (float) rightLeg.getX(); + this.stand.rightLeg[1] = (float) rightLeg.getY(); + this.stand.rightLeg[2] = (float) rightLeg.getZ(); + + EulerAngle leftArm = stand.getLeftArmPose(); + this.stand.leftArm[0] = (float) leftArm.getX(); + this.stand.leftArm[1] = (float) leftArm.getY(); + this.stand.leftArm[2] = (float) leftArm.getZ(); + + EulerAngle rightArm = stand.getRightArmPose(); + this.stand.rightArm[0] = (float) rightArm.getX(); + this.stand.rightArm[1] = (float) rightArm.getY(); + this.stand.rightArm[2] = (float) rightArm.getZ(); + + if (!stand.hasArms()) { + this.stand.noarms = true; + } + if (!stand.hasBasePlate()) { + this.stand.noplate = true; + } + if (!stand.hasGravity()) { + this.stand.nogravity = true; + } + if (!stand.isVisible()) { + this.stand.invisible = true; + } + if (stand.isSmall()) { + this.stand.small = true; + } + + + return; } case ENDERMITE: // NEW @@ -530,6 +582,45 @@ public class EntityWrapper { if (this.inventory[4] != null) { stand.setBoots(this.inventory[4]); } + if (this.stand.head[0] != 0 || this.stand.head[1] != 0 || this.stand.head[2] != 0) { + EulerAngle pose = new EulerAngle(this.stand.head[0], this.stand.head[1], this.stand.head[2]); + stand.setHeadPose(pose); + } + if (this.stand.body[0] != 0 || this.stand.body[1] != 0 || this.stand.body[2] != 0) { + EulerAngle pose = new EulerAngle(this.stand.body[0], this.stand.body[1], this.stand.body[2]); + stand.setBodyPose(pose); + } + if (this.stand.leftLeg[0] != 0 || this.stand.leftLeg[1] != 0 || this.stand.leftLeg[2] != 0) { + EulerAngle pose = new EulerAngle(this.stand.leftLeg[0], this.stand.leftLeg[1], this.stand.leftLeg[2]); + stand.setLeftLegPose(pose); + } + if (this.stand.rightLeg[0] != 0 || this.stand.rightLeg[1] != 0 || this.stand.rightLeg[2] != 0) { + EulerAngle pose = new EulerAngle(this.stand.rightLeg[0], this.stand.rightLeg[1], this.stand.rightLeg[2]); + stand.setRightLegPose(pose); + } + if (this.stand.leftArm[0] != 0 || this.stand.leftArm[1] != 0 || this.stand.leftArm[2] != 0) { + EulerAngle pose = new EulerAngle(this.stand.leftArm[0], this.stand.leftArm[1], this.stand.leftArm[2]); + stand.setLeftArmPose(pose); + } + if (this.stand.rightArm[0] != 0 || this.stand.rightArm[1] != 0 || this.stand.rightArm[2] != 0) { + EulerAngle pose = new EulerAngle(this.stand.rightArm[0], this.stand.rightArm[1], this.stand.rightArm[2]); + stand.setRightArmPose(pose); + } + if (this.stand.invisible) { + stand.setVisible(false); + } + if (this.stand.noarms) { + stand.setArms(false); + } + if (this.stand.nogravity) { + stand.setGravity(false); + } + if (this.stand.noplate) { + stand.setBasePlate(false); + } + if (this.stand.small) { + stand.setSmall(true); + } restoreLiving((LivingEntity) entity); return entity; }