Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,19 +1,28 @@
--- a/net/minecraft/server/EntityVex.java
+++ b/net/minecraft/server/EntityVex.java
@@ -1,6 +1,7 @@
package net.minecraft.server;
@@ -2,6 +2,7 @@
import java.util.EnumSet;
import javax.annotation.Nullable;
+import org.bukkit.event.entity.EntityTargetEvent;
public class EntityVex extends EntityMonster {
@@ -178,7 +179,7 @@
}
@@ -45,7 +46,7 @@
this.goalSelector.a(8, new EntityVex.d());
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])); // CraftBukkit - decompile error
this.targetSelector.a(2, new EntityVex.b(this));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
}
@@ -189,7 +190,7 @@
@Override
public void c() {
- EntityVex.this.setGoalTarget(EntityVex.this.b.getGoalTarget());
+ EntityVex.this.setGoalTarget(EntityVex.this.b.getGoalTarget(), EntityTargetEvent.TargetReason.OWNER_ATTACKED_TARGET, true); // CraftBukkit
- EntityVex.this.setGoalTarget(EntityVex.this.c.getGoalTarget());
+ EntityVex.this.setGoalTarget(EntityVex.this.c.getGoalTarget(), EntityTargetEvent.TargetReason.OWNER_ATTACKED_TARGET, true); // CraftBukkit
super.c();
}
}