mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2025-06-25 02:04:44 +02:00
Preparing for a bugfix release. Also made sure mcMMO saves info on
shutdown.
This commit is contained in:
@ -118,12 +118,6 @@ public class Combat
|
||||
|
||||
int xp = (int) (xpinc * 2 * LoadProperties.pvpxprewardmodifier);
|
||||
|
||||
if(xp < 0)
|
||||
{
|
||||
//Debug messages here
|
||||
xp = Math.abs(xp); //Temporary fix
|
||||
}
|
||||
|
||||
if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker))
|
||||
PPa.addXP(SkillType.AXES, xp*10, attacker);
|
||||
if(m.isSwords(attacker.getItemInHand()) && mcPermissions.getInstance().swords(attacker))
|
||||
|
@ -84,7 +84,7 @@ public class mcEntityListener implements Listener
|
||||
|
||||
/*
|
||||
* Demolitions Expert
|
||||
*/
|
||||
|
||||
if(event.getCause() == DamageCause.BLOCK_EXPLOSION)
|
||||
{
|
||||
if(event.getEntity() instanceof Player)
|
||||
@ -93,6 +93,7 @@ public class mcEntityListener implements Listener
|
||||
BlastMining.demolitionsExpertise(player, event);
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
if(event.getEntity() instanceof LivingEntity)
|
||||
{
|
||||
@ -213,6 +214,7 @@ public class mcEntityListener implements Listener
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@EventHandler (priority = EventPriority.LOW)
|
||||
public void onExplosionPrime(ExplosionPrimeEvent event)
|
||||
{
|
||||
@ -228,6 +230,7 @@ public class mcEntityListener implements Listener
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@EventHandler (priority = EventPriority.LOW)
|
||||
public void onEnitityExplode(EntityExplodeEvent event)
|
||||
{
|
||||
@ -242,7 +245,8 @@ public class mcEntityListener implements Listener
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
public boolean isBow(ItemStack is){
|
||||
if (is.getTypeId() == 261){
|
||||
return true;
|
||||
|
@ -166,17 +166,6 @@ public class mcMMO extends JavaPlugin
|
||||
|
||||
FileManager FM = SpoutManager.getFileManager();
|
||||
FM.addToPreLoginCache(this, SpoutStuff.getFiles());
|
||||
|
||||
/*
|
||||
Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this,
|
||||
new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
mmoHelper.updateAll();
|
||||
}
|
||||
}, 20, 20);
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
@ -239,9 +228,17 @@ public class mcMMO extends JavaPlugin
|
||||
return PP.inParty();
|
||||
}
|
||||
|
||||
public void onDisable() {
|
||||
Bukkit.getServer().getScheduler().cancelTasks(this);
|
||||
System.out.println("mcMMO was disabled.");
|
||||
public void onDisable()
|
||||
{
|
||||
//Make sure to save player information if the server shuts down
|
||||
for(Player x : Bukkit.getServer().getOnlinePlayers())
|
||||
{
|
||||
Users.getProfile(x).save();
|
||||
}
|
||||
|
||||
Bukkit.getServer().getScheduler().cancelTasks(this); //This removes our tasks
|
||||
|
||||
System.out.println("mcMMO was disabled."); //How informative!
|
||||
}
|
||||
|
||||
private void registerCommands() {
|
||||
|
Reference in New Issue
Block a user