feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Log getting stung by bees

Browse Source 
Fixes #780
This commit is contained in:
Brokkonaut
2020-01-24 04:23:59 +01:00
parent 1cda6506c7
commit 8b34e39797
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/diddiz/LogBlock/EntityChange.java
View File

@ -28,7 +28,8 @@ public class EntityChange implements LookupCacheElement {
KILL,
MODIFY,
ADDEQUIP,
REMOVEEQUIP;
REMOVEEQUIP,
GET_STUNG;
private static EntityChangeType[] values = values();
@ -113,6 +114,8 @@ public class EntityChange implements LookupCacheElement {
}
} else if (changeType == EntityChangeType.MODIFY) {
msg.addExtra(createTextComponentWithColor("modified ", INTERACT.getColor()));
} else if (changeType == EntityChangeType.GET_STUNG) {
msg.addExtra(createTextComponentWithColor("got stung by ", DESTROY.getColor()));
} else {
msg.addExtra(createTextComponentWithColor("did an unknown action to ", INTERACT.getColor()));
}

7
src/main/java/de/diddiz/LogBlock/WorldEditor.java
View File

@ -20,6 +20,7 @@ import org.bukkit.block.data.type.TechnicalPiston.Type;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Bee;
import org.bukkit.entity.Entity;
import org.bukkit.entity.ItemFrame;
import org.bukkit.inventory.EquipmentSlot;
@ -324,6 +325,12 @@ public class WorldEditor implements Runnable {
}
}
return PerformResult.NO_ACTION; // the entity is not there, or equip does not match
} else if (changeType == EntityChangeType.GET_STUNG) {
UUID uuid = getReplacedUUID(entityId, entityUUID);
Entity existing = BukkitUtils.loadEntityAround(loc.getChunk(), uuid);
if (existing != null && existing instanceof Bee) {
((Bee) existing).setHasStung(!rollback);
}
}
return PerformResult.NO_ACTION;
}

12
src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
View File

@ -5,6 +5,7 @@ import org.bukkit.Material;
import org.bukkit.block.BlockFace;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Bee;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Hanging;
import org.bukkit.entity.IronGolem;
@ -226,6 +227,17 @@ public class AdvancedEntityLogging extends LoggingListener {
}
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
Entity damager = event.getDamager();
if (damager instanceof Bee && !((Bee) damager).hasStung()) {
if (Config.isLogging(damager.getWorld(), EntityLogging.MODIFY, damager)) {
Actor actor = Actor.actorFromEntity(event.getEntity());
consumer.queueEntityModification(actor, damager.getUniqueId(), damager.getType(), damager.getLocation(), EntityChange.EntityChangeType.GET_STUNG, null);
}
}
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerArmorStandManipulate(PlayerArmorStandManipulateEvent event) {
ArmorStand entity = event.getRightClicked();