twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-18 22:03:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.16.1

Browse Source
This commit is contained in:
md_5
2020-06-25 10:00:00 +10:00
parent be6aaf046e
commit 7ea3c040bc
424 changed files with 5960 additions and 5636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
nms-patches/EntityBee.patch
View File

@@ -1,15 +1,6 @@
--- a/net/minecraft/server/EntityBee.java
+++ b/net/minecraft/server/EntityBee.java
@@ -21,7 +21,7 @@
private float bA;
private int bB;
private int ticksSincePollination;
- private int cannotEnterHiveTicks;
+ public int cannotEnterHiveTicks; // PAIL private -> public
private int numCropsGrownSincePollination;
private int bF = 0;
private int bG = 0;
@@ -152,12 +152,12 @@
@@ -137,7 +137,7 @@
}
if (b0 > 0) {
@@ -18,23 +9,16 @@
}
}
this.setHasStung(true);
- this.setGoalTarget((EntityLiving) null);
+ this.setGoalTarget((EntityLiving) null, org.bukkit.event.entity.EntityTargetEvent.TargetReason.FORGOT_TARGET, true); // CraftBukkit
this.a(SoundEffects.ENTITY_BEE_STING, 1.0F, 1.0F);
}
@@ -546,12 +546,16 @@
@@ -512,11 +512,15 @@
} else {
Entity entity = damagesource.getEntity();
- if (!this.world.isClientSide && entity instanceof EntityHuman && !((EntityHuman) entity).isCreative() && this.hasLineOfSight(entity) && !this.isNoAI()) {
- if (!this.world.isClientSide) {
+ // CraftBukkit start
+ boolean result = super.damageEntity(damagesource, f);
+
+ if (result && !this.world.isClientSide && entity instanceof EntityHuman && !((EntityHuman) entity).isCreative() && this.hasLineOfSight(entity) && !this.isNoAI()) {
+ if (result && !this.world.isClientSide) {
this.bJ.l();
this.a(entity);
}
- return super.damageEntity(damagesource, f);
@@ -43,7 +27,7 @@
}
}
@@ -572,7 +576,7 @@
@@ -537,7 +541,7 @@
class d extends EntityBee.a {
private d() {
@@ -52,7 +36,7 @@
}
@Override
@@ -632,7 +636,7 @@
@@ -597,7 +601,7 @@
class g extends EntityBee.a {
private g() {
@@ -61,7 +45,7 @@
}
@Override
@@ -681,7 +685,7 @@
@@ -646,7 +650,7 @@
}
}
@@ -69,8 +53,8 @@
+ if (flag && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(EntityBee.this, blockposition, iblockdata.set(blockstateinteger, (Integer) iblockdata.get(blockstateinteger) + 1)).isCancelled()) { // Spigot
EntityBee.this.world.triggerEffect(2005, blockposition, 0);
EntityBee.this.world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(blockstateinteger, (Integer) iblockdata.get(blockstateinteger) + 1));
EntityBee.this.eO();
@@ -696,7 +700,7 @@
EntityBee.this.fj();
@@ -661,7 +665,7 @@
class i extends EntityBee.a {
private i() {
@@ -79,7 +63,7 @@
}
@Override
@@ -760,7 +764,7 @@
@@ -725,7 +729,7 @@
private int h = 0;
k() {
@@ -88,7 +72,7 @@
this.a(EnumSet.of(PathfinderGoal.Type.MOVE));
}
@@ -944,7 +948,7 @@
@@ -909,7 +913,7 @@
private int c;
f() {
@@ -97,8 +81,8 @@
this.c = EntityBee.this.world.random.nextInt(10);
this.a(EnumSet.of(PathfinderGoal.Type.MOVE));
}
@@ -1001,7 +1005,7 @@
private PathEntity e;
@@ -967,7 +971,7 @@
private int f;
e() {
- super(null);
@@ -106,10 +90,10 @@
this.c = EntityBee.this.world.random.nextInt(10);
this.d = Lists.newArrayList();
this.e = null;
@@ -1210,7 +1214,7 @@
@@ -1187,7 +1191,7 @@
@Override
protected void a(EntityInsentient entityinsentient, EntityLiving entityliving) {
if (entityinsentient instanceof EntityBee && this.e.hasLineOfSight(entityliving) && ((EntityBee) entityinsentient).a((Entity) entityliving)) {
if (entityinsentient instanceof EntityBee && this.e.hasLineOfSight(entityliving)) {
- entityinsentient.setGoalTarget(entityliving);
+ entityinsentient.setGoalTarget(entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_ENTITY, true); // CraftBukkit - reason
}