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

Merge branch 'master' of github.com:mcMMO-Dev/mcMMO

Browse Source
This commit is contained in:
nossr50 2012-03-01 10:08:37 -08:00
commit 0f89a9e1e8
4 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -55,9 +55,7 @@ Version 1.3.00-dev
! Changed mob spawn tracking to use Unique Entity ID instead of Entity Object
! Changed stats command name to mcstats for better plugin compatibility
! Changed god mode to turn off if player enters world where he does not have mcgod permission
! Changed Taming to also gain XP from shearing
! Changed Taming to also gain XP from animal taming
! Changed Taming to also gain XP from milking cows
! Changed Swords Bleeding effect to never kill
! Changed Bleeding to never go beyond 10 ticks
! Changed to use Bukkit's built-in ignoreCancelledEvents system

4
src/main/java/com/gmail/nossr50/config/LoadProperties.java
View File

@ -42,7 +42,7 @@ public class LoadProperties {
MySQLserverName, MySQLdbName, MySQLdbPass, nWood, nStone,
nIron, nGold, nDiamond, locale, nString, nLeather;
public static int treeFellerThreshold, mjungle, mtameWolf, mshearing, mmilkCow, mfishing, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
public static int treeFellerThreshold, mjungle, mtameWolf, mfishing, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
chimaeraId, msandstone, mbase, moak, mbirch, mspruce, mmelon,
mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mgold,
mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack,
@ -240,9 +240,7 @@ public class LoadProperties {
mendstone = readInteger("Experience.Mining.End_Stone", 150);
mmossstone = readInteger("Experience.Mining.Moss_Stone", 30);
mshearing = readInteger("Experience.Taming.Shearing", 250);
mtameWolf = readInteger("Experience.Taming.Animal_Taming.Wolf", 250);
mmilkCow = readInteger("Experience.Taming.Milking", 50);
mfishing = readInteger("Experience.Fishing.Base", 800);

38
src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
View File

@ -28,12 +28,12 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.entity.Wolf;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerBucketFillEvent;
import org.bukkit.event.player.PlayerChangedWorldEvent;
import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
@ -44,7 +44,6 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerLoginEvent;
import org.bukkit.event.player.PlayerPickupItemEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerShearEntityEvent;
import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.Combat;
@ -92,18 +91,6 @@ public class mcPlayerListener implements Listener
}
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onSheepUndressing(PlayerShearEntityEvent event)
{
Player player = event.getPlayer();
if(mcPermissions.getInstance().taming(player))
{
PlayerProfile PP = Users.getProfile(player);
PP.addXP(SkillType.TAMING, LoadProperties.mshearing, player);
Skills.XpCheckSkill(SkillType.TAMING, player);
}
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerFish(PlayerFishEvent event)
{
@ -198,6 +185,14 @@ public class mcPlayerListener implements Listener
event.setCancelled(true);
player.updateInventory();
}
if(mat.equals(Material.TNT))
{
TNTPrimed tnt = player.getWorld().spawn(block.getLocation(), TNTPrimed.class);
block.setType(Material.AIR);
tnt.setFuseTicks(0);
// plugin.misc.tntTracker.remove(block);
}
if(LoadProperties.enableAbilities && m.abilityBlockCheck(block))
{
@ -325,21 +320,6 @@ public class mcPlayerListener implements Listener
}
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onCowMilking(PlayerBucketFillEvent event){
Player player = event.getPlayer();
if(mcPermissions.getInstance().taming(player))
{
if(event.getItemStack().getTypeId() == 335)
{
PlayerProfile PP = Users.getProfile(player);
PP.addXP(SkillType.TAMING, LoadProperties.mmilkCow, player);
Skills.XpCheckSkill(SkillType.TAMING, player);
}
}
}
// Dynamically aliasing commands need to be re-done.
// For now, using a command with an alias will send both the original command, and the mcMMO command
@EventHandler(priority = EventPriority.LOWEST)

2
src/main/resources/config.yml
View File

@ -229,10 +229,8 @@ Experience:
End_Stone: 150
Moss_Stone: 30
Taming:
Shearing: 250
Animal_Taming:
Wolf: 250
Milking: 50
Combat:
Multiplier:
Animals: 1.0