diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 8dc176f..e886e33 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/plugin.yml b/src/plugin.yml index 722cc35..7729372 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper -version: 3.7.3ar1 +version: 3.7.3ar2 commands: money: description: Tells the player the amount of money they are holding. diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java index 000ff12..62f8ec1 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java @@ -9,6 +9,7 @@ import java.util.Map; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.DyeColor; +import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.block.Block; @@ -17,6 +18,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; +import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.Guardian; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Monster; @@ -2887,4 +2889,9 @@ public class GenericFunctions { } } } + + public static void spawnXP(Location location, int expAmount) { + ExperienceOrb orb = location.getWorld().spawn(location, ExperienceOrb.class); + orb.setExperience(orb.getExperience() + expAmount); + } } diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index 1d82eb8..c44ce2b 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -3926,7 +3926,11 @@ public class TwosideKeeper extends JavaPlugin implements Listener { double val = Math.random(); log("ExpChange event: "+val,5); int amt = ev.getAmount(); - if (val<=((double)amt/(double)65)*(0.00125)*ARTIFACT_RARITY && amt<=500) { + int testamt = amt; + if (amt>500) { + testamt=500; + } + if (val<=((double)testamt/(double)65)*(0.00125)*ARTIFACT_RARITY) { ev.getPlayer().getWorld().dropItemNaturally(ev.getPlayer().getLocation(), Artifact.createArtifactItem(ArtifactItem.MALLEABLE_BASE)); ev.getPlayer().sendMessage(ChatColor.LIGHT_PURPLE+"A strange item has appeared nearby."); } @@ -4237,8 +4241,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { Item it = deathloc.getWorld().dropItemNaturally(mer.getLocation(), drop.get(i)); it.setInvulnerable(true); } - ExperienceOrb exp = (ExperienceOrb)deathloc.getWorld().spawnEntity(mer.getLocation(), EntityType.EXPERIENCE_ORB); - exp.setExperience((int)(expdrop*0.25)); + GenericFunctions.spawnXP(mer.getLocation(), (int)(expdrop*0.25)); }} ,50); break; @@ -4265,8 +4268,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { Item it = deathloc.getWorld().dropItemNaturally(mer1.getLocation(), drop.get(i)); it.setInvulnerable(true); } - ExperienceOrb exp = (ExperienceOrb)deathloc.getWorld().spawnEntity(mer1.getLocation(), EntityType.EXPERIENCE_ORB); - exp.setExperience((int)(expdrop1*0.25)); + GenericFunctions.spawnXP(mer1.getLocation(), (int)(expdrop1*0.25)); }} ,50); break;