Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 00:30:07 +01:00
Code Issues Projects Releases Wiki Activity

Version 1.1.05

Browse Source
This commit is contained in:
nossr50 2011-08-17 07:30:00 -07:00
parent f4ae7c8798
commit 1011084d3b
6 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mcMMO/Changelog.txt
View File

@ -1,5 +1,11 @@
Changelog:
#Versions without changelogs probably had very small misc fixes, like tweaks to the source code
Version 1.1.05
Maps dropped from excavation are created correctly, and represent the area they are found in
Fixed an exploit with clay and excavation
Fixed a NPE with locking xp bars
Fixed the !AdeptDiamond! localization error when repairing diamond with a skill below 50
Version 1.1.04
Removed URL settings for XPBAR/XPICON/HPBAR
Added single URL setting for mcMMO

7
mcMMO/com/gmail/nossr50/m.java
View File

@ -74,12 +74,9 @@ public class m
public static boolean shouldBeWatched(Block block)
{
int id = block.getTypeId();
if(id == 16 || id == 73 || id == 49 || id == 81 || id == 83 || id == 86 || id == 91 || id == 1 || id == 17 || id == 42 || id == 87 || id == 89 || id == 2 || id == 3 || id == 12 || id == 13 || id == 21 || id == 15 || id == 14 || id == 56 || id == 38 || id == 37 || id == 39 || id == 40 || id == 24){
return true;
} else {
return false;
}
return id == 82 || id == 16 || id == 73 || id == 49 || id == 81 || id == 83 || id == 86 || id == 91 || id == 1 || id == 17 || id == 42 || id == 87 || id == 89 || id == 2 || id == 3 || id == 12 || id == 13 || id == 21 || id == 15 || id == 14 || id == 56 || id == 38 || id == 37 || id == 39 || id == 40 || id == 24;
}
public static int getPowerLevel(Player player)
{
PlayerProfile PP = Users.getProfile(player);

8
mcMMO/com/gmail/nossr50/skills/Excavation.java
View File

@ -1,12 +1,14 @@
package com.gmail.nossr50.skills;
import java.util.ArrayList;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.map.MapView;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.m;
@ -147,8 +149,10 @@ public class Excavation
{
if(Math.random() * 50 > 49)
{
MapView mv = Bukkit.getServer().createMap(loc.getWorld());
xp+= LoadProperties.mmap * LoadProperties.xpGainMultiplier;
is.add(new ItemStack(Material.MAP, 1, (byte)0, (byte)0));
is.add(new ItemStack(Material.MAP, 1, (byte)0, (byte) mv.getId()));
}
}
if(LoadProperties.bucket && PP.getSkillLevel(SkillType.EXCAVATION) >= 500)

2
mcMMO/com/gmail/nossr50/skills/Repair.java
View File

@ -443,7 +443,7 @@ public class Repair {
PlayerProfile PP = Users.getProfile(player);
if ((isDiamondTools(is) || isDiamondArmor(is)) && PP.getSkillLevel(SkillType.REPAIR) < LoadProperties.repairdiamondlevel)
{
player.sendMessage(mcLocale.getString("AdeptDiamond"));
player.sendMessage(mcLocale.getString("Skills.AdeptDiamond"));
} else if (isDiamondTools(is) && !hasItem(player, rDiamond) || isIronTools(is) && !hasItem(player, rIron) || isGoldTools(is) && !hasItem(player, rGold)){
if(isDiamondTools(is) && !hasItem(player, rDiamond))
player.sendMessage(mcLocale.getString("Skills.NeedMore")+" "+ChatColor.BLUE+ nDiamond);

14
mcMMO/com/gmail/nossr50/spout/SpoutStuff.java
View File

@ -533,6 +533,18 @@ public class SpoutStuff
SpoutManager.getPlayer(player).getMainScreen().setDirty(true);
} else if (PP.getXpBarLocked())
{
if(xpbars.get(player) != null && xpicons.get(player) != null)
{
updateXpBarUrl(PP, player);
} else
{
initializeXpBarDisplay(SpoutManager.getPlayer(player));
updateXpBarUrl(PP, player);
}
}
}
public static void updateXpBarUrl(PlayerProfile PP, Player player)
{
int num = getXpInc(PP.getSkillXpLevel(PP.getSkillLock()), PP.getXpToLevel(PP.getSkillLock()));
@ -541,8 +553,6 @@ public class SpoutStuff
SpoutManager.getPlayer(player).getMainScreen().setDirty(true);
}
}
public static void updateXpBarFill(Player player)
{
PlayerProfile PP = Users.getProfile(player);

2
mcMMO/plugin.yml
View File

@ -1,6 +1,6 @@
name: mcMMO
main: com.gmail.nossr50.mcMMO
version: 1.1.04
version: 1.1.05
softdepend: [Spout]
commands:
xplock: