mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 17:31:06 +01:00
58 lines
3.4 KiB
Diff
58 lines
3.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||
|
|
Date: Sun, 23 Aug 2020 15:28:35 +0200
|
||
|
|
Subject: [PATCH] Add more Evoker API
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityEvoker.java b/src/main/java/net/minecraft/world/entity/monster/EntityEvoker.java
|
||
|
|
index 64bfd84e8a5a0c2b1fec7044b688c7cc1083f18a..2aa6b6ca93c25c59ad224348aad1bb34d9bbc6a3 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EntityEvoker.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityEvoker.java
|
||
|
|
@@ -40,7 +40,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
|
||
|
|
|
||
|
|
public class EntityEvoker extends EntityIllagerWizard {
|
||
|
|
|
||
|
|
- private EntitySheep bo;
|
||
|
|
+ private EntitySheep bo; public final EntitySheep getWololoTarget() { return this.bo; } public final void setWololoTarget(EntitySheep sheep) { this.bo = sheep; } // Paper - OBFHELPER
|
||
|
|
|
||
|
|
public EntityEvoker(EntityTypes<? extends EntityEvoker> entitytypes, World world) {
|
||
|
|
super(entitytypes, world);
|
||
|
|
@@ -59,7 +59,7 @@ public class EntityEvoker extends EntityIllagerWizard {
|
||
|
|
this.goalSelector.a(8, new PathfinderGoalRandomStroll(this, 0.6D));
|
||
|
|
this.goalSelector.a(9, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 3.0F, 1.0F));
|
||
|
|
this.goalSelector.a(10, new PathfinderGoalLookAtPlayer(this, EntityInsentient.class, 8.0F));
|
||
|
|
- this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{EntityRaider.class})).a());
|
||
|
|
+ this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{EntityRaider.class})).a(new Class[0])); // Paper - decompile fix
|
||
|
|
this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
|
||
|
|
this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
|
||
|
|
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, false));
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
|
||
|
|
index 5e8e9d95068342661a962aae9878a7eafaa06207..75a7832e9841921497a9a2d1cfd1b05807fe6ede 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
|
||
|
|
@@ -1,5 +1,6 @@
|
||
|
|
package org.bukkit.craftbukkit.entity;
|
||
|
|
|
||
|
|
+import net.minecraft.world.entity.animal.EntitySheep;
|
||
|
|
import net.minecraft.world.entity.monster.EntityEvoker;
|
||
|
|
import net.minecraft.world.entity.monster.EntityIllagerWizard;
|
||
|
|
import org.bukkit.craftbukkit.CraftServer;
|
||
|
|
@@ -36,4 +37,17 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker {
|
||
|
|
public void setCurrentSpell(Evoker.Spell spell) {
|
||
|
|
getHandle().setSpell(spell == null ? EntityIllagerWizard.Spell.NONE : EntityIllagerWizard.Spell.a(spell.ordinal()));
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ // Paper start
|
||
|
|
+ @Override
|
||
|
|
+ public org.bukkit.entity.Sheep getWololoTarget() {
|
||
|
|
+ EntitySheep sheep = getHandle().getWololoTarget();
|
||
|
|
+ return sheep == null ? null : (org.bukkit.entity.Sheep) sheep.getBukkitEntity();
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ @Override
|
||
|
|
+ public void setWololoTarget(org.bukkit.entity.Sheep sheep) {
|
||
|
|
+ getHandle().setWololoTarget(sheep == null ? null : ((org.bukkit.craftbukkit.entity.CraftSheep) sheep).getHandle());
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
}
|