From 8264f79a4e770aea8a4ab154ca1cbe275f196fbf Mon Sep 17 00:00:00 2001 From: Ste3et_C0st Date: Sat, 13 Jul 2019 20:15:26 +0200 Subject: [PATCH] DiceFurniture 1.14 Update, sorry i forgot to switch the Spigot version ^^ --- .settings/org.eclipse.jdt.core.prefs | 2 ++ pom.xml | 4 ++-- src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java | 6 ------ src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java | 7 +++++-- .../Ste3et_C0st/Furniture/Objects/garden/graveStone.java | 8 ++++---- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 2d1de9d..39e9a95 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -8,7 +8,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/pom.xml b/pom.xml index ad789aa..154a1c0 100644 --- a/pom.xml +++ b/pom.xml @@ -87,13 +87,13 @@ org.spigotmc spigot-api - 1.13-R0.1-SNAPSHOT + 1.14-R0.1-SNAPSHOT provided org.bukkit bukkit - 1.13-R0.1-SNAPSHOT + 1.14-R0.1-SNAPSHOT provided diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java index c50387e..d9c4a54 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java @@ -9,8 +9,6 @@ import org.bukkit.block.BlockFace; import org.bukkit.entity.Arrow; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; -import org.bukkit.entity.SpectralArrow; -import org.bukkit.entity.TippedArrow; import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; @@ -61,10 +59,6 @@ public class Crossbow extends FurnitureHelper { Arrow a = null; if(mat.equals(Material.ARROW)){ a = (Arrow) getWorld().spawnEntity(start, EntityType.ARROW); - }else if(mat.equals(Material.SPECTRAL_ARROW)){ - a = (SpectralArrow) getWorld().spawnEntity(start, EntityType.SPECTRAL_ARROW); - }else if(mat.equals(Material.TIPPED_ARROW)){ - a = (TippedArrow) getWorld().spawnEntity(start, EntityType.TIPPED_ARROW); } a.setCritical(true); a.setVelocity(v); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java index 48704d6..791d75e 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java @@ -49,6 +49,7 @@ public class weaponStand extends Furniture implements Listener{ Player p = null; Inventory inv = null; + String title = ""; @Override public void onBreak(Player player) { @@ -107,7 +108,9 @@ public class weaponStand extends Furniture implements Listener{ is1.setItemMeta(im1); is3.setItemMeta(im3); - inv = Bukkit.createInventory(null, 45, "§cWeaponBox"); + this.title = "§cWeaponBox"; + inv = Bukkit.createInventory(null, 45, this.title); + List asList = getManager().getfArmorStandByObjectID(getObjID()); int j = 1; @@ -166,7 +169,7 @@ public class weaponStand extends Furniture implements Listener{ if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(p==null){return;} if(inv==null){return;} - if(!e.getInventory().getTitle().equalsIgnoreCase(inv.getTitle())){return;} + if(!e.getView().getTitle().equalsIgnoreCase(this.title)){return;} List asList = getManager().getfArmorStandByObjectID(getObjID()); int j = 1; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java index d1c9016..50d2969 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java @@ -42,8 +42,8 @@ public class graveStone extends FurnitureHelper{ Location sign = getLutil().getRelativ(kreutz2.getBlock().getLocation(), getBlockFace(), 0D, 1D); this.signLoc = sign; - if(!sign.getBlock().getType().equals(Material.WALL_SIGN)){ - sign.getBlock().setType(Material.WALL_SIGN); + if(!sign.getBlock().getType().equals(Material.OAK_SIGN)){ + sign.getBlock().setType(Material.OAK_SIGN); this.sign = sign.getBlock(); BlockState state = this.sign.getState(); LocationUtil util = getLutil(); @@ -146,14 +146,14 @@ public class graveStone extends FurnitureHelper{ } public String[] getText(){ - if(sign==null || !sign.getType().equals(Material.WALL_SIGN)){return null;} + if(sign==null || !sign.getType().equals(Material.OAK_SIGN)){return null;} Sign sign = (Sign) this.sign.getState(); return sign.getLines(); } public void setText(Integer line, String text){ if(line==null || text == null){return;} - if(sign==null || !sign.getType().equals(Material.WALL_SIGN)){return;} + if(sign==null || !sign.getType().equals(Material.OAK_SIGN)){return;} Sign sign = (Sign) this.sign.getState(); sign.setLine(line, text); sign.update(true, false);