Update for Spigot and mavenize.
This commit is contained in:
+9
-2
@@ -56,6 +56,7 @@ import com.garbagemule.MobArena.region.RegionPoint;
|
||||
import com.garbagemule.MobArena.repairable.*;
|
||||
import com.garbagemule.MobArena.util.TextUtils;
|
||||
import com.garbagemule.MobArena.waves.MABoss;
|
||||
import org.bukkit.projectiles.ProjectileSource;
|
||||
|
||||
public class ArenaListener
|
||||
{
|
||||
@@ -540,7 +541,10 @@ public class ArenaListener
|
||||
|
||||
// Make sure to grab the owner of a projectile/pet
|
||||
if (damager instanceof Projectile) {
|
||||
damager = ((Projectile) damager).getShooter();
|
||||
ProjectileSource shooter = ((Projectile) damager).getShooter();
|
||||
if (shooter instanceof Entity) {
|
||||
damager = (Entity) shooter;
|
||||
}
|
||||
}
|
||||
else if (damager instanceof Wolf && arena.hasPet(damager)) {
|
||||
damager = (Player) ((Wolf) damager).getOwner();
|
||||
@@ -626,7 +630,10 @@ public class ArenaListener
|
||||
damager = edbe.getDamager();
|
||||
|
||||
if (damager instanceof Projectile) {
|
||||
damager = ((Projectile) damager).getShooter();
|
||||
ProjectileSource shooter = ((Projectile) damager).getShooter();
|
||||
if (shooter instanceof Entity) {
|
||||
damager = (Entity) shooter;
|
||||
}
|
||||
}
|
||||
|
||||
// Repair weapons if necessary
|
||||
+4
-2
@@ -8,10 +8,13 @@ import com.garbagemule.MobArena.commands.CommandInfo;
|
||||
import com.garbagemule.MobArena.commands.Commands;
|
||||
import com.garbagemule.MobArena.framework.ArenaMaster;
|
||||
import com.garbagemule.MobArena.util.config.ConfigUtils;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.HashSet;
|
||||
|
||||
import static com.garbagemule.MobArena.util.config.ConfigUtils.setLocation;
|
||||
|
||||
@CommandInfo(
|
||||
@@ -39,11 +42,10 @@ public class ClassChestCommand implements Command {
|
||||
}
|
||||
|
||||
Player p = (Player) sender;
|
||||
Block b = p.getTargetBlock(null, 10);
|
||||
Block b = p.getTargetBlock(new HashSet<Material>(), 10);
|
||||
|
||||
switch (b.getType()) {
|
||||
case CHEST:
|
||||
case LOCKED_CHEST:
|
||||
case ENDER_CHEST:
|
||||
case TRAPPED_CHEST:
|
||||
break;
|
||||
+1
-1
@@ -354,7 +354,7 @@ public class Metrics {
|
||||
boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
|
||||
String pluginVersion = description.getVersion();
|
||||
String serverVersion = Bukkit.getVersion();
|
||||
int playersOnline = Bukkit.getServer().getOnlinePlayers().length;
|
||||
int playersOnline = Bukkit.getServer().getOnlinePlayers().size();
|
||||
|
||||
// END server software specific section -- all code below does not use any code outside of this class / Java
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user