Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-10-01 16:07:51 +02:00
Code Issues Projects Releases Wiki Activity

Fix ArmorEquipEvent for EntityCreature

Browse Source
This commit is contained in:
Felix Cravic 2020-05-06 22:42:04 +02:00
parent 59214b3b96
commit f6803f9c24
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/minestom/server/entity/EntityCreature.java
View File

@ -3,6 +3,7 @@ package net.minestom.server.entity;
import net.minestom.server.collision.CollisionUtils; import net.minestom.server.collision.CollisionUtils;
import net.minestom.server.entity.pathfinding.EntityPathFinder; import net.minestom.server.entity.pathfinding.EntityPathFinder;
import net.minestom.server.entity.property.Attribute; import net.minestom.server.entity.property.Attribute;
import net.minestom.server.event.ArmorEquipEvent;
import net.minestom.server.item.ItemStack; import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.server.play.*; import net.minestom.server.network.packet.server.play.*;
import net.minestom.server.network.player.PlayerConnection; import net.minestom.server.network.player.PlayerConnection;
@ -170,7 +171,7 @@ public abstract class EntityCreature extends LivingEntity {
@Override @Override
public void setHelmet(ItemStack itemStack) { public void setHelmet(ItemStack itemStack) {
this.helmet = itemStack; this.helmet = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.HELMET);
syncEquipment(EntityEquipmentPacket.Slot.HELMET); syncEquipment(EntityEquipmentPacket.Slot.HELMET);
} }
@ -181,7 +182,7 @@ public abstract class EntityCreature extends LivingEntity {
@Override @Override
public void setChestplate(ItemStack itemStack) { public void setChestplate(ItemStack itemStack) {
this.chestplate = itemStack; this.chestplate = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.CHESTPLATE);
syncEquipment(EntityEquipmentPacket.Slot.CHESTPLATE); syncEquipment(EntityEquipmentPacket.Slot.CHESTPLATE);
} }
@ -192,7 +193,7 @@ public abstract class EntityCreature extends LivingEntity {
@Override @Override
public void setLeggings(ItemStack itemStack) { public void setLeggings(ItemStack itemStack) {
this.leggings = itemStack; this.leggings = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.LEGGINGS);
syncEquipment(EntityEquipmentPacket.Slot.LEGGINGS); syncEquipment(EntityEquipmentPacket.Slot.LEGGINGS);
} }
@ -203,7 +204,7 @@ public abstract class EntityCreature extends LivingEntity {
@Override @Override
public void setBoots(ItemStack itemStack) { public void setBoots(ItemStack itemStack) {
this.boots = itemStack; this.boots = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.BOOTS);
syncEquipment(EntityEquipmentPacket.Slot.BOOTS); syncEquipment(EntityEquipmentPacket.Slot.BOOTS);
} }
@ -260,4 +261,10 @@ public abstract class EntityCreature extends LivingEntity {
if (blockPosition.getY() > getPosition().getY()) if (blockPosition.getY() > getPosition().getY())
jump(1); jump(1);
} }
private ItemStack getEquipmentItem(ItemStack itemStack, ArmorEquipEvent.ArmorSlot armorSlot) {
ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent(itemStack, armorSlot);
callEvent(ArmorEquipEvent.class, armorEquipEvent);
return armorEquipEvent.getArmorItem();
}
} }

17
src/main/java/net/minestom/server/inventory/EquipmentHandler.java
View File

@ -1,11 +1,8 @@
package net.minestom.server.inventory; package net.minestom.server.inventory;
import net.minestom.server.event.ArmorEquipEvent;
import net.minestom.server.item.ItemStack; import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.server.play.EntityEquipmentPacket; import net.minestom.server.network.packet.server.play.EntityEquipmentPacket;
import static net.minestom.server.utils.inventory.PlayerInventoryUtils.*;
public interface EquipmentHandler { public interface EquipmentHandler {
ItemStack getItemInMainHand(); ItemStack getItemInMainHand();
@ -51,18 +48,4 @@ public interface EquipmentHandler {
} }
} }
default ArmorEquipEvent getArmorEquipEventPacket(int slot, ItemStack itemStack) {
if (slot == HELMET_SLOT) {
return new ArmorEquipEvent(itemStack, ArmorEquipEvent.ArmorSlot.HELMET);
} else if (slot == CHESTPLATE_SLOT) {
return new ArmorEquipEvent(itemStack, ArmorEquipEvent.ArmorSlot.CHESTPLATE);
} else if (slot == LEGGINGS_SLOT) {
return new ArmorEquipEvent(itemStack, ArmorEquipEvent.ArmorSlot.LEGGINGS);
} else if (slot == BOOTS_SLOT) {
return new ArmorEquipEvent(itemStack, ArmorEquipEvent.ArmorSlot.BOOTS);
}
return null;
}
} }

13
src/main/java/net/minestom/server/inventory/PlayerInventory.java
View File

@ -189,7 +189,18 @@ public class PlayerInventory implements InventoryModifier, InventoryClickHandler
} else if (slot == OFFHAND_SLOT) { } else if (slot == OFFHAND_SLOT) {
equipmentSlot = EntityEquipmentPacket.Slot.OFF_HAND; equipmentSlot = EntityEquipmentPacket.Slot.OFF_HAND;
} else { } else {
ArmorEquipEvent armorEquipEvent = getArmorEquipEventPacket(slot, itemStack); ArmorEquipEvent armorEquipEvent = null;
if (slot == HELMET_SLOT) {
armorEquipEvent = new ArmorEquipEvent(itemStack, ArmorEquipEvent.ArmorSlot.HELMET);
} else if (slot == CHESTPLATE_SLOT) {
armorEquipEvent = new ArmorEquipEvent(itemStack, ArmorEquipEvent.ArmorSlot.CHESTPLATE);
} else if (slot == LEGGINGS_SLOT) {
armorEquipEvent = new ArmorEquipEvent(itemStack, ArmorEquipEvent.ArmorSlot.LEGGINGS);
} else if (slot == BOOTS_SLOT) {
armorEquipEvent = new ArmorEquipEvent(itemStack, ArmorEquipEvent.ArmorSlot.BOOTS);
}
if (armorEquipEvent != null) { if (armorEquipEvent != null) {
equipmentSlot = armorEquipEvent.getArmorSlot().toEquipmentPacketSlot(); equipmentSlot = armorEquipEvent.getArmorSlot().toEquipmentPacketSlot();
player.callEvent(ArmorEquipEvent.class, armorEquipEvent); player.callEvent(ArmorEquipEvent.class, armorEquipEvent);