EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Drowned Transformation will no longer enabled XP on mob spawners, Kelp will now count the whole block for XP

Browse Source
This commit is contained in:
nossr50
2019-03-13 13:27:16 -07:00
parent 7296deb149
commit bb46b2a6ac
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -54,6 +54,19 @@ public class EntityListener implements Listener {
this.plugin = plugin;
}
@EventHandler(priority = EventPriority.MONITOR)
public void onEntityTransform(EntityTransformEvent event)
{
//Transfer metadata keys from mob-spawned mobs to new mobs
if(event.getEntity().getMetadata(mcMMO.entityMetadataKey) == null || event.getEntity().getMetadata(mcMMO.entityMetadataKey).size() <= 0)
{
for(Entity entity : event.getTransformedEntities())
{
entity.setMetadata(mcMMO.entityMetadataKey, mcMMO.metadataValue);
}
}
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onEntityTargetEntity(EntityTargetLivingEntityEvent event)
{

2
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@ -126,7 +126,7 @@ public class HerbalismManager extends SkillManager {
public void herbalismBlockCheck(BlockState blockState) {
Player player = getPlayer();
Material material = blockState.getType();
boolean oneBlockPlant = !(material == Material.CACTUS || material == Material.CHORUS_PLANT || material == Material.SUGAR_CANE);
boolean oneBlockPlant = !(material == Material.CACTUS || material == Material.CHORUS_PLANT || material == Material.SUGAR_CANE || material == Material.KELP_PLANT);
// Prevents placing and immediately breaking blocks for exp
if (oneBlockPlant && mcMMO.getPlaceStore().isTrue(blockState)) {