sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Zombie Pigman is now detected properly when deciding if bonus loot

Browse Source 
should be dropped.
Malleable bases do not drop for massive amounts of experience (ex.
Dropped from players dying.)
This commit is contained in:
sigonasr2 2016-08-01 20:50:32 -05:00
parent e8b6d1c109
commit 8be7044e91
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

2
src/plugin.yml
View File

@ -1,6 +1,6 @@
name: TwosideKeeper name: TwosideKeeper
main: sig.plugin.TwosideKeeper.TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper
version: 3.7.3a version: 3.7.3ar1
commands: commands:
money: money:
description: Tells the player the amount of money they are holding. description: Tells the player the amount of money they are holding.

3
src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
View File

@ -2117,8 +2117,7 @@ public class GenericFunctions {
} }
public static boolean isBossMonster(Monster m) { public static boolean isBossMonster(Monster m) {
if (m.getType()==EntityType.ZOMBIE && if (MonsterController.isZombieLeader(m) ||
MonsterController.isZombieLeader(m) ||
(m.getType()==EntityType.GUARDIAN && (m.getType()==EntityType.GUARDIAN &&
((Guardian)m).isElder()) || ((Guardian)m).isElder()) ||
m.getType()==EntityType.ENDER_DRAGON || m.getType()==EntityType.ENDER_DRAGON ||

3
src/sig/plugin/TwosideKeeper/MonsterController.java
View File

@ -16,6 +16,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.Guardian; import org.bukkit.entity.Guardian;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Monster; import org.bukkit.entity.Monster;
import org.bukkit.entity.PigZombie;
import org.bukkit.entity.Skeleton; import org.bukkit.entity.Skeleton;
import org.bukkit.entity.Zombie; import org.bukkit.entity.Zombie;
import org.bukkit.entity.Skeleton.SkeletonType; import org.bukkit.entity.Skeleton.SkeletonType;
@ -524,7 +525,7 @@ public class MonsterController {
} }
public static boolean isZombieLeader(LivingEntity ent) { public static boolean isZombieLeader(LivingEntity ent) {
if (ent instanceof Zombie) { if ((ent instanceof Zombie) || (ent instanceof PigZombie)) {
MonsterDifficulty md = getMonsterDifficulty((Monster)ent); MonsterDifficulty md = getMonsterDifficulty((Monster)ent);
if if
( (

2
src/sig/plugin/TwosideKeeper/TwosideKeeper.java
View File

@ -3926,7 +3926,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
double val = Math.random(); double val = Math.random();
log("ExpChange event: "+val,5); log("ExpChange event: "+val,5);
int amt = ev.getAmount(); int amt = ev.getAmount();
if (val<=((double)amt/(double)65)*(0.00125)*ARTIFACT_RARITY) { if (val<=((double)amt/(double)65)*(0.00125)*ARTIFACT_RARITY && amt<=500) {
ev.getPlayer().getWorld().dropItemNaturally(ev.getPlayer().getLocation(), Artifact.createArtifactItem(ArtifactItem.MALLEABLE_BASE)); ev.getPlayer().getWorld().dropItemNaturally(ev.getPlayer().getLocation(), Artifact.createArtifactItem(ArtifactItem.MALLEABLE_BASE));
ev.getPlayer().sendMessage(ChatColor.LIGHT_PURPLE+"A strange item has appeared nearby."); ev.getPlayer().sendMessage(ChatColor.LIGHT_PURPLE+"A strange item has appeared nearby.");
} }