diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 8fa289d..fbdf6e3 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/sig/plugin/TwosideKeeper/CustomDamage.java b/src/sig/plugin/TwosideKeeper/CustomDamage.java index 48eb3db..1bdea02 100644 --- a/src/sig/plugin/TwosideKeeper/CustomDamage.java +++ b/src/sig/plugin/TwosideKeeper/CustomDamage.java @@ -178,7 +178,7 @@ public class CustomDamage { if (sb.hasMetadata("SPIDERBALL")) { dmg = 10.0*10.0; reason = "Spider Ball"; - TwosideKeeper.log("Got here to damage.", 1); + TwosideKeeper.log("Got here to damage.", 5); GenericFunctions.removeNoDamageTick(target, damager); } } diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java index 29d5d0f..d3194b2 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java @@ -130,7 +130,7 @@ public class GenericFunctions { if (p!=null) { p.sendMessage(ChatColor.LIGHT_PURPLE+"You still feel the artifact's presence inside of you..."); } - return convertArtifactToDust(item); + return convertArtifactToDust(item.clone()); } return null; } @@ -158,7 +158,8 @@ public class GenericFunctions { m.setLore(oldlore); item.setItemMeta(m); item.setType(Material.SULPHUR); - item.setDurability((short)0); + item.setDurability((short)0); + item.setAmount(1); return item; } @@ -3080,7 +3081,8 @@ public class GenericFunctions { } private static void UpdateArtifactItemType(ItemStack item) { - if (isArtifactArmor(item)) { + if (isArtifactArmor(item) && + item.getType()!=Material.SULPHUR) { double durabilityratio = item.getDurability()/item.getType().getMaxDurability(); item.setType(Material.valueOf("LEATHER_"+item.getType().name().split("_")[1])); item.setDurability((short)(durabilityratio*item.getType().getMaxDurability())); @@ -3553,8 +3555,9 @@ public class GenericFunctions { return true; } else { for (Integer i : remaining.keySet()) { - Item it = p.getWorld().dropItem(p.getLocation(), remaining.get(i)); + Item it = p.getWorld().dropItemNaturally(p.getLocation(), remaining.get(i)); it.setInvulnerable(true); + it.setPickupDelay(0); } return false; } diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index 3f191b2..390753f 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -934,6 +934,8 @@ public class TwosideKeeper extends JavaPlugin implements Listener { filesave=getDataFolder(); //Store the location of where our data folder is. log("Data folder at "+filesave+".",3); + Bukkit.getServer().setSpawnRadius(1); + //log("Spawn Radius is "+Bukkit.getServer().getSpawnRadius(),0); time_passed+=-Bukkit.getWorld("world").getFullTime(); LASTSERVERCHECK=getServerTickTime(); @@ -1159,7 +1161,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { if (p.getLocation().add(0,0,0).getBlock().getType()==Material.PISTON_MOVING_PIECE) { p.getLocation().add(0,0,0).getBlock().setType(Material.AIR); } - if ((SERVER_TYPE==ServerType.TEST || SERVER_TYPE==ServerType.QUIET) && p.isOp()) { + if (p.isOp()) { /*PlayerStructure pd = PlayerStructure.GetPlayerStructure(p); pd.swordcombo=20;*/ /*float f = ((org.bukkit.craftbukkit.v1_9_R1.entity.CraftLivingEntity)p).getHandle().getAbsorptionHearts(); @@ -1181,7 +1183,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { //TwosideKeeperAPI.setItemSet(p.getEquipment().getItemInMainHand(), ItemSet.PANROS); //p.getWorld().dropItemNaturally(p.getLocation(), TwosideKeeperAPI.generateMegaPiece(Material.LEATHER_CHESTPLATE, true, true, 5)); //p.getWorld().dropItemNaturally(p.getLocation(), HUNTERS_COMPASS.getItemStack()); - AwakenedArtifact.setEXP(p.getEquipment().getItemInMainHand(), 999); + //AwakenedArtifact.setEXP(p.getEquipment().getItemInMainHand(), 999); /*p.getWorld().dropItemNaturally(p.getLocation(), UPGRADE_SHARD.getItemStack()); ItemStack upgrade = UPGRADE_SHARD.getItemStack(); GenericFunctions.setUpgradeShardTier(upgrade,3); @@ -1265,7 +1267,8 @@ public class TwosideKeeper extends JavaPlugin implements Listener { */ /*ItemStack item = p.getEquipment().getItemInMainHand(); AwakenedArtifact.addPotentialEXP(item, 50000, p);*/ - TwosideKeeperAPI.removeAllArtifactAbilityPoints(p.getEquipment().getItemInMainHand()); + p.getEquipment().getItemInMainHand().setType(Material.SULPHUR); + //TwosideKeeperAPI.removeAllArtifactAbilityPoints(p.getEquipment().getItemInMainHand()); //p.sendMessage(tpstracker.getTPS()+""); //GenericFunctions.addObscureHardenedItemBreaks(p.getEquipment().getItemInMainHand(), 4); }