SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.15

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
paper-server/nms-patches/EntityPanda.patch
View File

@@ -8,8 +8,8 @@
+
public class EntityPanda extends EntityAnimal {
private static final DataWatcherObject<Integer> bA = DataWatcher.a(EntityPanda.class, DataWatcherRegistry.b);
@@ -445,7 +447,7 @@
private static final DataWatcherObject<Integer> bx = DataWatcher.a(EntityPanda.class, DataWatcherRegistry.b);
@@ -448,7 +450,7 @@
@Override
protected void a(EntityItem entityitem) {
@@ -18,16 +18,16 @@
ItemStack itemstack = entityitem.getItemStack();
this.setSlot(EnumItemSlot.MAINHAND, itemstack);
@@ -673,7 +675,7 @@
@@ -672,7 +674,7 @@
@Override
protected void a(EntityInsentient entityinsentient, EntityLiving entityliving) {
if (entityinsentient instanceof EntityPanda && ((EntityPanda) entityinsentient).dR()) {
if (entityinsentient instanceof EntityPanda && ((EntityPanda) entityinsentient).em()) {
- entityinsentient.setGoalTarget(entityliving);
+ entityinsentient.setGoalTarget(entityliving, EntityTargetEvent.TargetReason.TARGET_ATTACKED_ENTITY, true); // CraftBukkit
}
}
@@ -777,9 +779,9 @@
@@ -776,9 +778,9 @@
private final EntityPanda i;
public c(EntityPanda entitypanda, Class<T> oclass, float f, double d0, double d1) {
@@ -39,15 +39,3 @@
this.i = entitypanda;
}
@@ -808,9 +810,9 @@
this.e.s(32);
this.f = this.e.ticksLived + 600;
if (this.e.df()) {
- EntityHuman entityhuman = this.b.a(EntityPanda.d.d, (EntityLiving) this.e);
+ EntityHuman entityhuman = this.b.a(d, (EntityLiving) this.e); // CraftBukkit - decompile error
- this.e.setGoalTarget(entityhuman);
+ this.e.setGoalTarget(entityhuman, EntityTargetEvent.TargetReason.CLOSEST_PLAYER, true); // CraftBukkit
}
}