TheCreeperCow / CraftBukkit / eae15943507

Commits

Parker Hawke authored and md_5 committed eae15943507 27 Aug 2020

#721: Add EntityCategory API to LivingEntity

src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java

Modified

-28
+import net.minecraft.server.EntitySmallFireball;
-29
+import net.minecraft.server.EntitySnowball;
-30
+import net.minecraft.server.EntitySpectralArrow;
-31
+import net.minecraft.server.EntityThrownExpBottle;
-32
+import net.minecraft.server.EntityThrownTrident;
-33
+import net.minecraft.server.EntityTippedArrow;
-34
+import net.minecraft.server.EntityTypes;
-35
+import net.minecraft.server.EntityWither;
-36
+import net.minecraft.server.EntityWitherSkull;
-37
+import net.minecraft.server.EnumHand;
-+
+import net.minecraft.server.EnumMonsterType;
-39
+import net.minecraft.server.GenericAttributes;
-40
+import net.minecraft.server.MobEffect;
-41
+import net.minecraft.server.MobEffectList;
-42
+import org.apache.commons.lang.Validate;
-43
+import org.bukkit.FluidCollisionMode;
-44
+import org.bukkit.Location;
-45
+import org.bukkit.Material;
-46
+import org.bukkit.attribute.Attribute;
-47
+import org.bukkit.attribute.AttributeInstance;
-48
+import org.bukkit.block.Block;
-51
+import org.bukkit.craftbukkit.entity.memory.CraftMemoryKey;
-52
+import org.bukkit.craftbukkit.entity.memory.CraftMemoryMapper;
-53
+import org.bukkit.craftbukkit.inventory.CraftEntityEquipment;
-54
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
-55
+import org.bukkit.craftbukkit.potion.CraftPotionUtil;
-56
+import org.bukkit.entity.AbstractArrow;
-57
+import org.bukkit.entity.DragonFireball;
-58
+import org.bukkit.entity.Egg;
-59
+import org.bukkit.entity.EnderPearl;
-60
+import org.bukkit.entity.Entity;
-+
+import org.bukkit.entity.EntityCategory;
-62
+import org.bukkit.entity.EntityType;
-63
+import org.bukkit.entity.Fireball;
-64
+import org.bukkit.entity.Firework;
-65
+import org.bukkit.entity.FishHook;
-66
+import org.bukkit.entity.HumanEntity;
-67
+import org.bukkit.entity.LingeringPotion;
-68
+import org.bukkit.entity.LivingEntity;
-69
+import org.bukkit.entity.LlamaSpit;
-70
+import org.bukkit.entity.Player;
-71
+import org.bukkit.entity.Projectile;
-628
-629
+    @Override
-630
+    public <T> T getMemory(MemoryKey<T> memoryKey) {
-631
+        return (T) getHandle().getBehaviorController().getMemory(CraftMemoryKey.fromMemoryKey(memoryKey)).map(CraftMemoryMapper::fromNms).orElse(null);
-632
+    }
-633
-634
+    @Override
-635
+    public <T> void setMemory(MemoryKey<T> memoryKey, T t) {
-636
+        getHandle().getBehaviorController().setMemory(CraftMemoryKey.fromMemoryKey(memoryKey), CraftMemoryMapper.toNms(t));
-637
+    }
-+
-+
+    @Override
-+
+    public EntityCategory getCategory() {
-+
+        EnumMonsterType type = getHandle().getMonsterType(); // Not actually an enum?
-+
-+
+        if (type == EnumMonsterType.UNDEFINED) {
-+
+            return EntityCategory.NONE;
-+
+        } else if (type == EnumMonsterType.UNDEAD) {
-+
+            return EntityCategory.UNDEAD;
-+
+        } else if (type == EnumMonsterType.ARTHROPOD) {
-+
+            return EntityCategory.ARTHROPOD;
-+
+        } else if (type == EnumMonsterType.ILLAGER) {
-+
+            return EntityCategory.ILLAGER;
-+
+        } else if (type == EnumMonsterType.e) { // PAIL rename WATER_MOB
-+
+            return EntityCategory.WATER;
-+
+        }
-+
-+
+        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Spigot.");
-+
+    }
-657
+}

CraftBukkit

Commits

Jira Issues

Add shortcut