Merge pull request #154 from nossr50/master

Preparing for 1.2.11 bugfix, made mcmmo save data when shutting down.
This commit is contained in:
Grant 2012-02-11 10:29:31 -08:00
commit 900d58a6f4
5 changed files with 26 additions and 26 deletions

View File

@ -1,12 +1,17 @@
Changelog: Changelog:
#Versions without changelogs probably had very small misc fixes, like tweaks to the source code #Versions without changelogs probably had very small misc fixes, like tweaks to the source code
Version 2.0-dev Version 1.2.11
- Removed legacy Permission & PEX support. SuperPerms support only now. - Removed legacy Permission & PEX support. SuperPerms support only now.
- Added framework for new Mining sub-skill: Blast Mining.
- Made Smooth Brick to Mossy Brick and Dirt to Grass for green thumb configurable (Issue #120) - Made Smooth Brick to Mossy Brick and Dirt to Grass for green thumb configurable (Issue #120)
- Changed mcMMO to save data periodically to optimize performance with FlatFile & MySQL - Added MagmaCube to XP tables
- Made optimizations to Skull Splitter/Serrated Strikes
- Made it so players take damage if they try to log out with Serrated Strikes stacked onto them (Issue #131)
- Changed mcMMO to save data periodically to optimize performance with FlatFile & MySQL (Issue #138)
- Added a configurable save interval for the new save system - Added a configurable save interval for the new save system
- Fixed a bug with the odds calculations for Serrated Strikes
- Fixed several commands not working from console (mmoedit, etc..) (Issue #150)
- Added a success message when executing xprate from console
Version 1.2.10 Version 1.2.10
- Fixed issue with receiving Woodcutting XP for all blocks broken (Issue #103) - Fixed issue with receiving Woodcutting XP for all blocks broken (Issue #103)

View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gmail.nossr50.mcMMO</groupId> <groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId> <artifactId>mcMMO</artifactId>
<version>2.0-dev</version> <version>1.2.11</version>
<name>mcMMO</name> <name>mcMMO</name>
<url>https://github.com/TheYeti/mcMMO</url> <url>https://github.com/TheYeti/mcMMO</url>
<issueManagement> <issueManagement>

View File

@ -118,12 +118,6 @@ public class Combat
int xp = (int) (xpinc * 2 * LoadProperties.pvpxprewardmodifier); 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)) if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker))
PPa.addXP(SkillType.AXES, xp*10, attacker); PPa.addXP(SkillType.AXES, xp*10, attacker);
if(m.isSwords(attacker.getItemInHand()) && mcPermissions.getInstance().swords(attacker)) if(m.isSwords(attacker.getItemInHand()) && mcPermissions.getInstance().swords(attacker))

View File

@ -84,7 +84,7 @@ public class mcEntityListener implements Listener
/* /*
* Demolitions Expert * Demolitions Expert
*/
if(event.getCause() == DamageCause.BLOCK_EXPLOSION) if(event.getCause() == DamageCause.BLOCK_EXPLOSION)
{ {
if(event.getEntity() instanceof Player) if(event.getEntity() instanceof Player)
@ -93,6 +93,7 @@ public class mcEntityListener implements Listener
BlastMining.demolitionsExpertise(player, event); BlastMining.demolitionsExpertise(player, event);
} }
} }
*/
if(event.getEntity() instanceof LivingEntity) if(event.getEntity() instanceof LivingEntity)
{ {
@ -213,6 +214,7 @@ public class mcEntityListener implements Listener
} }
} }
/*
@EventHandler (priority = EventPriority.LOW) @EventHandler (priority = EventPriority.LOW)
public void onExplosionPrime(ExplosionPrimeEvent event) public void onExplosionPrime(ExplosionPrimeEvent event)
{ {
@ -228,6 +230,7 @@ public class mcEntityListener implements Listener
} }
} }
@EventHandler (priority = EventPriority.LOW) @EventHandler (priority = EventPriority.LOW)
public void onEnitityExplode(EntityExplodeEvent event) public void onEnitityExplode(EntityExplodeEvent event)
{ {
@ -242,7 +245,8 @@ public class mcEntityListener implements Listener
} }
} }
} }
*/
public boolean isBow(ItemStack is){ public boolean isBow(ItemStack is){
if (is.getTypeId() == 261){ if (is.getTypeId() == 261){
return true; return true;

View File

@ -166,17 +166,6 @@ public class mcMMO extends JavaPlugin
FileManager FM = SpoutManager.getFileManager(); FileManager FM = SpoutManager.getFileManager();
FM.addToPreLoginCache(this, SpoutStuff.getFiles()); 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(); return PP.inParty();
} }
public void onDisable() { public void onDisable()
Bukkit.getServer().getScheduler().cancelTasks(this); {
System.out.println("mcMMO was disabled."); //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() { private void registerCommands() {