mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2025-06-25 02:04:44 +02:00
Added XP for Animal Taming
This commit is contained in:
@ -57,7 +57,7 @@ public class LoadProperties {
|
||||
MySQLserverName, MySQLdbName, MySQLdbPass, nWood, nStone,
|
||||
nIron, nGold, nDiamond, locale, nString, nLeather;
|
||||
|
||||
public static int mshearing, mfishing, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
|
||||
public static int mtameWolf, mshearing, mfishing, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
|
||||
chimaeraId, msandstone, mbase, mpine, mbirch, mspruce, mmelon,
|
||||
mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mgold,
|
||||
mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack,
|
||||
@ -267,6 +267,7 @@ public class LoadProperties {
|
||||
mmossstone = readInteger("Experience.Mining.Moss_Stone", 30);
|
||||
|
||||
mshearing = readInteger("Experience.Taming.Shearing", 250);
|
||||
mtameWolf = readInteger("Experience.Taming.Animal_Taming.Wolf", 250);
|
||||
|
||||
mfishing = readInteger("Experience.Fishing.Base", 800);
|
||||
|
||||
|
@ -32,6 +32,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
|
||||
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
||||
import org.bukkit.event.entity.EntityDeathEvent;
|
||||
import org.bukkit.event.entity.EntityExplodeEvent;
|
||||
import org.bukkit.event.entity.EntityTameEvent;
|
||||
import org.bukkit.event.entity.ExplosionPrimeEvent;
|
||||
import org.bukkit.event.entity.FoodLevelChangeEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
@ -39,6 +40,7 @@ import org.bukkit.inventory.ItemStack;
|
||||
import com.gmail.nossr50.Combat;
|
||||
import com.gmail.nossr50.Users;
|
||||
import com.gmail.nossr50.mcMMO;
|
||||
import com.gmail.nossr50.mcPermissions;
|
||||
import com.gmail.nossr50.config.LoadProperties;
|
||||
import com.gmail.nossr50.datatypes.PlayerProfile;
|
||||
import com.gmail.nossr50.datatypes.SkillType;
|
||||
@ -223,8 +225,7 @@ public class mcEntityListener implements Listener
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@EventHandler (priority = EventPriority.LOW)
|
||||
public void onEnitityExplode(EntityExplodeEvent event)
|
||||
{
|
||||
@ -334,6 +335,20 @@ public class mcEntityListener implements Listener
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler (priority = EventPriority.MONITOR)
|
||||
public void onEntityTame(EntityTameEvent event)
|
||||
{
|
||||
Player player = (Player) event.getOwner();
|
||||
if(mcPermissions.getInstance().taming(player))
|
||||
{
|
||||
PlayerProfile PP = Users.getProfile(player);
|
||||
if(event.getEntity() instanceof Wolf)
|
||||
{
|
||||
PP.addXP(SkillType.TAMING, LoadProperties.mtameWolf, player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isBow(ItemStack is){
|
||||
if (is.getTypeId() == 261){
|
||||
return true;
|
||||
|
Reference in New Issue
Block a user