EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #148 from nossr50/master

Browse Source 
Fixed the instant refresh bug. Fixed blockListener monitoring skills.
This commit is contained in:
Grant 2012-02-10 09:59:11 -08:00
commit 470b29eeca
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -5,6 +5,8 @@ Version 2.0-dev
- 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)
- Changed mcMMO to save data periodically to optimize performance with FlatFile & MySQL
- Added a configurable save interval for the new save system
Version 1.2.10
- Fixed issue with receiving Woodcutting XP for all blocks broken (Issue #103)

8
src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
View File

@ -76,7 +76,7 @@ public class PlayerProfile
public PlayerProfile(Player player)
{
hud = LoadProperties.defaulthud;
//Setup the HashMap for ability ATS & DATS
//Setup the HashMap for ability DATS
for(AbilityType abilityType : AbilityType.values())
{
skillsDATS.put(abilityType, 0);
@ -822,17 +822,15 @@ public class PlayerProfile
{
skills.put(skillType, 0);
}
public int getSkillDATS(AbilityType abilityType)
public long getSkillDATS(AbilityType abilityType)
{
long convertedBack = skillsDATS.get(abilityType) * 1000;
return skillsDATS.get(abilityType);
}
public void setSkillDATS(AbilityType abilityType, long value)
{
System.out.println("Storing to DATS: "+value);
int wearsOff = (int) (value * .001D);
System.out.println("After dividing by 1000: "+wearsOff);
skillsDATS.put(abilityType, wearsOff);
System.out.println("Should be the same as the above value: "+skillsDATS.get(abilityType));
}
public void resetCooldowns()
{

2
src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
View File

@ -298,8 +298,6 @@ public class mcBlockListener implements Listener
ItemStack inhand = player.getItemInHand();
Block block = event.getBlock();
Skills.monitorSkills(player, PP);
/*
* ABILITY PREPARATION CHECKS
*/

6
src/main/java/com/gmail/nossr50/skills/Skills.java
View File

@ -95,7 +95,7 @@ public class Skills
PP.setSerratedStrikesInformed(true);
player.sendMessage(mcLocale.getString("Skills.YourSerratedStrikes"));
}
if(!PP.getBerserkInformed() && curTime - (PP.getSkillDATS(AbilityType.BERSERK)*1000) >= (LoadProperties.berserkCooldown * 1000)){
if(!PP.getBerserkInformed() && (curTime - (PP.getSkillDATS(AbilityType.BERSERK)*1000)) >= (LoadProperties.berserkCooldown * 1000)){
PP.setBerserkInformed(true);
player.sendMessage(mcLocale.getString("Skills.YourBerserk"));
}
@ -126,9 +126,7 @@ public class Skills
PP.setHoePreparationMode(true);
}
}
public static void monitorSkills(Player player, PlayerProfile PP) {
monitorSkills(player, PP, System.currentTimeMillis());
}
public static void monitorSkills(Player player, PlayerProfile PP, long curTime){
if(PP.getHoePreparationMode() && curTime - (PP.getHoePreparationATS()*1000) >= 4000){
PP.setHoePreparationMode(false);

5
src/main/java/com/gmail/nossr50/skills/Unarmed.java
View File

@ -38,9 +38,12 @@ public class Unarmed {
{
PP.setFistsPreparationMode(false);
}
int ticks = 2;
int x = PP.getSkillLevel(SkillType.UNARMED);
while(x >= 50){
while(x >= 50)
{
x-=50;
ticks++;
}