364 lines
19 KiB
Diff
364 lines
19 KiB
Diff
--- a/net/minecraft/world/entity/player/EntityHuman.java
|
|
+++ b/net/minecraft/world/entity/player/EntityHuman.java
|
|
@@ -117,6 +117,19 @@
|
|
import net.minecraft.world.scores.ScoreboardTeam;
|
|
import net.minecraft.world.scores.ScoreboardTeamBase;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.nbt.NBTBase;
|
|
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.craftbukkit.util.CraftVector;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent;
|
|
+import org.bukkit.event.entity.EntityDamageEvent;
|
|
+import org.bukkit.event.entity.EntityExhaustionEvent;
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
|
+import org.bukkit.event.player.PlayerVelocityEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public abstract class EntityHuman extends EntityLiving {
|
|
|
|
public static final EnumMainHand DEFAULT_MAIN_HAND = EnumMainHand.RIGHT;
|
|
@@ -136,7 +149,8 @@
|
|
private static final int CURRENT_IMPULSE_CONTEXT_RESET_GRACE_TIME_TICKS = 40;
|
|
public static final Vec3D DEFAULT_VEHICLE_ATTACHMENT = new Vec3D(0.0D, 0.6D, 0.0D);
|
|
public static final EntitySize STANDING_DIMENSIONS = EntitySize.scalable(0.6F, 1.8F).withEyeHeight(1.62F).withAttachments(EntityAttachments.builder().attach(EntityAttachment.VEHICLE, EntityHuman.DEFAULT_VEHICLE_ATTACHMENT));
|
|
- private static final Map<EntityPose, EntitySize> POSES = ImmutableMap.builder().put(EntityPose.STANDING, EntityHuman.STANDING_DIMENSIONS).put(EntityPose.SLEEPING, EntityHuman.SLEEPING_DIMENSIONS).put(EntityPose.FALL_FLYING, EntitySize.scalable(0.6F, 0.6F).withEyeHeight(0.4F)).put(EntityPose.SWIMMING, EntitySize.scalable(0.6F, 0.6F).withEyeHeight(0.4F)).put(EntityPose.SPIN_ATTACK, EntitySize.scalable(0.6F, 0.6F).withEyeHeight(0.4F)).put(EntityPose.CROUCHING, EntitySize.scalable(0.6F, 1.5F).withEyeHeight(1.27F).withAttachments(EntityAttachments.builder().attach(EntityAttachment.VEHICLE, EntityHuman.DEFAULT_VEHICLE_ATTACHMENT))).put(EntityPose.DYING, EntitySize.fixed(0.2F, 0.2F).withEyeHeight(1.62F)).build();
|
|
+ // CraftBukkit - decompile error
|
|
+ private static final Map<EntityPose, EntitySize> POSES = ImmutableMap.<EntityPose, EntitySize>builder().put(EntityPose.STANDING, EntityHuman.STANDING_DIMENSIONS).put(EntityPose.SLEEPING, EntityHuman.SLEEPING_DIMENSIONS).put(EntityPose.FALL_FLYING, EntitySize.scalable(0.6F, 0.6F).withEyeHeight(0.4F)).put(EntityPose.SWIMMING, EntitySize.scalable(0.6F, 0.6F).withEyeHeight(0.4F)).put(EntityPose.SPIN_ATTACK, EntitySize.scalable(0.6F, 0.6F).withEyeHeight(0.4F)).put(EntityPose.CROUCHING, EntitySize.scalable(0.6F, 1.5F).withEyeHeight(1.27F).withAttachments(EntityAttachments.builder().attach(EntityAttachment.VEHICLE, EntityHuman.DEFAULT_VEHICLE_ATTACHMENT))).put(EntityPose.DYING, EntitySize.fixed(0.2F, 0.2F).withEyeHeight(1.62F)).build();
|
|
private static final DataWatcherObject<Float> DATA_PLAYER_ABSORPTION_ID = DataWatcher.<Float>defineId(EntityHuman.class, DataWatcherRegistry.FLOAT);
|
|
private static final DataWatcherObject<Integer> DATA_SCORE_ID = DataWatcher.<Integer>defineId(EntityHuman.class, DataWatcherRegistry.INT);
|
|
protected static final DataWatcherObject<Byte> DATA_PLAYER_MODE_CUSTOMISATION = DataWatcher.<Byte>defineId(EntityHuman.class, DataWatcherRegistry.BYTE);
|
|
@@ -155,7 +169,7 @@
|
|
private static final int DEFAULT_CURRENT_IMPULSE_CONTEXT_RESET_GRACE_TIME = 0;
|
|
private long timeEntitySatOnShoulder;
|
|
final PlayerInventory inventory;
|
|
- protected InventoryEnderChest enderChestInventory = new InventoryEnderChest();
|
|
+ protected InventoryEnderChest enderChestInventory = new InventoryEnderChest(this); // CraftBukkit - add "this" to constructor
|
|
public final ContainerPlayer inventoryMenu;
|
|
public Container containerMenu;
|
|
protected FoodMetaData foodData = new FoodMetaData();
|
|
@@ -195,6 +209,16 @@
|
|
private boolean ignoreFallDamageFromCurrentImpulse;
|
|
private int currentImpulseContextResetGraceTime;
|
|
|
|
+ // CraftBukkit start
|
|
+ public boolean fauxSleeping;
|
|
+ public int oldLevel = -1;
|
|
+
|
|
+ @Override
|
|
+ public CraftHumanEntity getBukkitEntity() {
|
|
+ return (CraftHumanEntity) super.getBukkitEntity();
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public EntityHuman(World world, BlockPosition blockposition, float f, GameProfile gameprofile) {
|
|
super(EntityTypes.PLAYER, world);
|
|
this.lastItemInMainHand = ItemStack.EMPTY;
|
|
@@ -366,7 +390,7 @@
|
|
}
|
|
|
|
private void turtleHelmetTick() {
|
|
- this.addEffect(new MobEffect(MobEffects.WATER_BREATHING, 200, 0, false, false, true));
|
|
+ this.addEffect(new MobEffect(MobEffects.WATER_BREATHING, 200, 0, false, false, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.TURTLE_HELMET); // CraftBukkit
|
|
}
|
|
|
|
private boolean isEquipped(Item item) {
|
|
@@ -518,8 +542,14 @@
|
|
public void rideTick() {
|
|
if (!this.level().isClientSide && this.wantsToStopRiding() && this.isPassenger()) {
|
|
this.stopRiding();
|
|
- this.setShiftKeyDown(false);
|
|
- } else {
|
|
+ // CraftBukkit start - SPIGOT-7316: no longer passenger, dismount and return
|
|
+ if (!this.isPassenger()) {
|
|
+ this.setShiftKeyDown(false);
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ {
|
|
+ // CraftBukkit end
|
|
super.rideTick();
|
|
this.oBob = this.bob;
|
|
this.bob = 0.0F;
|
|
@@ -590,7 +620,7 @@
|
|
private void playShoulderEntityAmbientSound(NBTTagCompound nbttagcompound) {
|
|
if (!nbttagcompound.isEmpty() && !nbttagcompound.getBooleanOr("Silent", false)) {
|
|
if (this.level().random.nextInt(200) == 0) {
|
|
- EntityTypes<?> entitytypes = (EntityTypes) nbttagcompound.read("id", EntityTypes.CODEC).orElse((Object) null);
|
|
+ EntityTypes<?> entitytypes = (EntityTypes) nbttagcompound.read("id", EntityTypes.CODEC).orElse(null); // CraftBukkit - decompile error
|
|
|
|
if (entitytypes == EntityTypes.PARROT && !EntityParrot.imitateNearbyMobs(this.level(), this)) {
|
|
this.level().playSound((Entity) null, this.getX(), this.getY(), this.getZ(), EntityParrot.getAmbient(this.level(), this.level().random), this.getSoundSource(), 1.0F, EntityParrot.getPitch(this.level().random));
|
|
@@ -777,7 +807,7 @@
|
|
this.setShoulderEntityLeft(nbttagcompound.getCompoundOrEmpty("ShoulderEntityLeft"));
|
|
this.setShoulderEntityRight(nbttagcompound.getCompoundOrEmpty("ShoulderEntityRight"));
|
|
this.setLastDeathLocation(nbttagcompound.read("LastDeathLocation", GlobalPos.CODEC));
|
|
- this.currentImpulseImpactPos = (Vec3D) nbttagcompound.read("current_explosion_impact_pos", Vec3D.CODEC).orElse((Object) null);
|
|
+ this.currentImpulseImpactPos = (Vec3D) nbttagcompound.read("current_explosion_impact_pos", Vec3D.CODEC).orElse(null); // CraftBukkit - decompile error
|
|
this.ignoreFallDamageFromCurrentImpulse = nbttagcompound.getBooleanOr("ignore_fall_damage_from_current_explosion", false);
|
|
this.currentImpulseContextResetGraceTime = nbttagcompound.getIntOr("current_impulse_context_reset_grace_time", 0);
|
|
}
|
|
@@ -829,10 +859,10 @@
|
|
if (this.isDeadOrDying()) {
|
|
return false;
|
|
} else {
|
|
- this.removeEntitiesOnShoulder();
|
|
+ // this.removeEntitiesOnShoulder(); // CraftBukkit - moved down
|
|
if (damagesource.scalesWithDifficulty()) {
|
|
if (worldserver.getDifficulty() == EnumDifficulty.PEACEFUL) {
|
|
- f = 0.0F;
|
|
+ return false; // CraftBukkit - f = 0.0f -> return false
|
|
}
|
|
|
|
if (worldserver.getDifficulty() == EnumDifficulty.EASY) {
|
|
@@ -844,7 +874,13 @@
|
|
}
|
|
}
|
|
|
|
- return f == 0.0F ? false : super.hurtServer(worldserver, damagesource, f);
|
|
+ // CraftBukkit start - Don't filter out 0 damage
|
|
+ boolean damaged = super.hurtServer(worldserver, damagesource, f);
|
|
+ if (damaged) {
|
|
+ this.removeEntitiesOnShoulder();
|
|
+ }
|
|
+ return damaged;
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
}
|
|
@@ -868,10 +904,29 @@
|
|
}
|
|
|
|
public boolean canHarmPlayer(EntityHuman entityhuman) {
|
|
- ScoreboardTeamBase scoreboardteambase = this.getTeam();
|
|
- ScoreboardTeamBase scoreboardteambase1 = entityhuman.getTeam();
|
|
+ // CraftBukkit start - Change to check OTHER player's scoreboard team according to API
|
|
+ // To summarize this method's logic, it's "Can parameter hurt this"
|
|
+ org.bukkit.scoreboard.Team team;
|
|
+ if (entityhuman instanceof EntityPlayer) {
|
|
+ EntityPlayer thatPlayer = (EntityPlayer) entityhuman;
|
|
+ team = thatPlayer.getBukkitEntity().getScoreboard().getPlayerTeam(thatPlayer.getBukkitEntity());
|
|
+ if (team == null || team.allowFriendlyFire()) {
|
|
+ return true;
|
|
+ }
|
|
+ } else {
|
|
+ // This should never be called, but is implemented anyway
|
|
+ org.bukkit.OfflinePlayer thisPlayer = entityhuman.level().getCraftServer().getOfflinePlayer(entityhuman.getScoreboardName());
|
|
+ team = entityhuman.level().getCraftServer().getScoreboardManager().getMainScoreboard().getPlayerTeam(thisPlayer);
|
|
+ if (team == null || team.allowFriendlyFire()) {
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
|
|
- return scoreboardteambase == null ? true : (!scoreboardteambase.isAlliedTo(scoreboardteambase1) ? true : scoreboardteambase.isAllowFriendlyFire());
|
|
+ if (this instanceof EntityPlayer) {
|
|
+ return !team.hasPlayer(((EntityPlayer) this).getBukkitEntity());
|
|
+ }
|
|
+ return !team.hasPlayer(this.level().getCraftServer().getOfflinePlayer(this.getScoreboardName()));
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
@Override
|
|
@@ -885,7 +940,12 @@
|
|
}
|
|
|
|
@Override
|
|
- protected void actuallyHurt(WorldServer worldserver, DamageSource damagesource, float f) {
|
|
+ // CraftBukkit start
|
|
+ protected boolean actuallyHurt(WorldServer worldserver, DamageSource damagesource, float f, EntityDamageEvent event) { // void -> boolean
|
|
+ if (true) {
|
|
+ return super.actuallyHurt(worldserver, damagesource, f, event);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (!this.isInvulnerableTo(worldserver, damagesource)) {
|
|
f = this.getDamageAfterArmorAbsorb(damagesource, f);
|
|
f = this.getDamageAfterMagicAbsorb(damagesource, f);
|
|
@@ -900,7 +960,7 @@
|
|
}
|
|
|
|
if (f != 0.0F) {
|
|
- this.causeFoodExhaustion(damagesource.getFoodExhaustion());
|
|
+ this.causeFoodExhaustion(damagesource.getFoodExhaustion(), EntityExhaustionEvent.ExhaustionReason.DAMAGED); // CraftBukkit - EntityExhaustionEvent
|
|
this.getCombatTracker().recordDamage(damagesource, f);
|
|
this.setHealth(this.getHealth() - f);
|
|
if (f < 3.4028235E37F) {
|
|
@@ -910,6 +970,7 @@
|
|
this.gameEvent(GameEvent.ENTITY_DAMAGE);
|
|
}
|
|
}
|
|
+ return false; // CraftBukkit
|
|
}
|
|
|
|
public boolean isTextFilteringEnabled() {
|
|
@@ -1066,10 +1127,15 @@
|
|
|
|
f *= 0.2F + f2 * f2 * 0.8F;
|
|
f1 *= f2;
|
|
- this.resetAttackStrengthTicker();
|
|
+ // this.resetAttackStrengthTicker(); // CraftBukkit - Moved to EntityLiving to reset the cooldown after the damage is dealt
|
|
if (entity.getType().is(TagsEntity.REDIRECTABLE_PROJECTILE) && entity instanceof IProjectile) {
|
|
IProjectile iprojectile = (IProjectile) entity;
|
|
|
|
+ // CraftBukkit start
|
|
+ if (CraftEventFactory.handleNonLivingEntityDamageEvent(entity, damagesource, f1, false)) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (iprojectile.deflect(ProjectileDeflection.AIM_DEFLECT, this, this, true)) {
|
|
this.level().playSound((Entity) null, this.getX(), this.getY(), this.getZ(), SoundEffects.PLAYER_ATTACK_NODAMAGE, this.getSoundSource());
|
|
return;
|
|
@@ -1167,9 +1233,26 @@
|
|
}
|
|
|
|
if (entity instanceof EntityPlayer && entity.hurtMarked) {
|
|
+ // CraftBukkit start - Add Velocity Event
|
|
+ boolean cancelled = false;
|
|
+ Player player = (Player) entity.getBukkitEntity();
|
|
+ org.bukkit.util.Vector velocity = CraftVector.toBukkit(vec3d);
|
|
+
|
|
+ PlayerVelocityEvent event = new PlayerVelocityEvent(player, velocity.clone());
|
|
+ this.level().getCraftServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ cancelled = true;
|
|
+ } else if (!velocity.equals(event.getVelocity())) {
|
|
+ player.setVelocity(event.getVelocity());
|
|
+ }
|
|
+
|
|
+ if (!cancelled) {
|
|
((EntityPlayer) entity).connection.send(new PacketPlayOutEntityVelocity(entity));
|
|
entity.hurtMarked = false;
|
|
entity.setDeltaMovement(vec3d);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
if (flag2) {
|
|
@@ -1236,9 +1319,14 @@
|
|
}
|
|
}
|
|
|
|
- this.causeFoodExhaustion(0.1F);
|
|
+ this.causeFoodExhaustion(0.1F, EntityExhaustionEvent.ExhaustionReason.ATTACK); // CraftBukkit - EntityExhaustionEvent
|
|
} else {
|
|
this.level().playSound((Entity) null, this.getX(), this.getY(), this.getZ(), SoundEffects.PLAYER_ATTACK_NODAMAGE, this.getSoundSource(), 1.0F, 1.0F);
|
|
+ // CraftBukkit start - resync on cancelled event
|
|
+ if (this instanceof EntityPlayer) {
|
|
+ ((EntityPlayer) this).getBukkitEntity().updateInventory();
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|
|
@@ -1273,7 +1361,14 @@
|
|
|
|
@Override
|
|
public void remove(Entity.RemovalReason entity_removalreason) {
|
|
- super.remove(entity_removalreason);
|
|
+ // CraftBukkit start - add Bukkit remove cause
|
|
+ this.remove(entity_removalreason, null);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void remove(Entity.RemovalReason entity_removalreason, EntityRemoveEvent.Cause cause) {
|
|
+ super.remove(entity_removalreason, cause);
|
|
+ // CraftBukkit end
|
|
this.inventoryMenu.removed(this);
|
|
if (this.containerMenu != null && this.hasContainerOpen()) {
|
|
this.doCloseContainer();
|
|
@@ -1337,6 +1432,12 @@
|
|
}
|
|
|
|
public Either<EntityHuman.EnumBedResult, Unit> startSleepInBed(BlockPosition blockposition) {
|
|
+ // CraftBukkit start
|
|
+ return this.startSleepInBed(blockposition, false);
|
|
+ }
|
|
+
|
|
+ public Either<EntityHuman.EnumBedResult, Unit> startSleepInBed(BlockPosition blockposition, boolean force) {
|
|
+ // CraftBukkit end
|
|
this.startSleeping(blockposition);
|
|
this.sleepCounter = 0;
|
|
return Either.right(Unit.INSTANCE);
|
|
@@ -1491,7 +1592,15 @@
|
|
}
|
|
|
|
public void startFallFlying() {
|
|
- this.setSharedFlag(7, true);
|
|
+ // CraftBukkit start
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callToggleGlideEvent(this, true).isCancelled()) {
|
|
+ this.setSharedFlag(7, true);
|
|
+ } else {
|
|
+ // SPIGOT-5542: must toggle like below
|
|
+ this.setSharedFlag(7, true);
|
|
+ this.setSharedFlag(7, false);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
@Override
|
|
@@ -1606,10 +1715,21 @@
|
|
return this.experienceLevel >= 30 ? 112 + (this.experienceLevel - 30) * 9 : (this.experienceLevel >= 15 ? 37 + (this.experienceLevel - 15) * 5 : 7 + this.experienceLevel * 2);
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
public void causeFoodExhaustion(float f) {
|
|
+ this.causeFoodExhaustion(f, EntityExhaustionEvent.ExhaustionReason.UNKNOWN);
|
|
+ }
|
|
+
|
|
+ public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) {
|
|
+ // CraftBukkit end
|
|
if (!this.abilities.invulnerable) {
|
|
if (!this.level().isClientSide) {
|
|
- this.foodData.addExhaustion(f);
|
|
+ // CraftBukkit start
|
|
+ EntityExhaustionEvent event = CraftEventFactory.callPlayerExhaustionEvent(this, reason, f);
|
|
+ if (!event.isCancelled()) {
|
|
+ this.foodData.addExhaustion(event.getExhaustion());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
}
|
|
@@ -1706,26 +1826,31 @@
|
|
|
|
protected void removeEntitiesOnShoulder() {
|
|
if (this.timeEntitySatOnShoulder + 20L < this.level().getGameTime()) {
|
|
- this.respawnEntityOnShoulder(this.getShoulderEntityLeft());
|
|
- this.setShoulderEntityLeft(new NBTTagCompound());
|
|
- this.respawnEntityOnShoulder(this.getShoulderEntityRight());
|
|
- this.setShoulderEntityRight(new NBTTagCompound());
|
|
+ // CraftBukkit start
|
|
+ if (this.respawnEntityOnShoulder(this.getShoulderEntityLeft())) {
|
|
+ this.setShoulderEntityLeft(new NBTTagCompound());
|
|
+ }
|
|
+ if (this.respawnEntityOnShoulder(this.getShoulderEntityRight())) {
|
|
+ this.setShoulderEntityRight(new NBTTagCompound());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
}
|
|
|
|
- private void respawnEntityOnShoulder(NBTTagCompound nbttagcompound) {
|
|
+ private boolean respawnEntityOnShoulder(NBTTagCompound nbttagcompound) { // CraftBukkit void->boolean
|
|
if (!this.level().isClientSide && !nbttagcompound.isEmpty()) {
|
|
- EntityTypes.create(nbttagcompound, this.level(), EntitySpawnReason.LOAD).ifPresent((entity) -> {
|
|
+ return EntityTypes.create(nbttagcompound, this.level(), EntitySpawnReason.LOAD).map((entity) -> { // CraftBukkit
|
|
if (entity instanceof EntityTameableAnimal entitytameableanimal) {
|
|
entitytameableanimal.setOwner(this);
|
|
}
|
|
|
|
entity.setPos(this.getX(), this.getY() + (double) 0.7F, this.getZ());
|
|
- ((WorldServer) this.level()).addWithUUID(entity);
|
|
- });
|
|
+ return ((WorldServer) this.level()).addWithUUID(entity, CreatureSpawnEvent.SpawnReason.SHOULDER_ENTITY); // CraftBukkit
|
|
+ }).orElse(true); // CraftBukkit
|
|
}
|
|
|
|
+ return true; // CraftBukkit
|
|
}
|
|
|
|
@Nullable
|