OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-22 08:15:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-6936: Cancelling EntityAirChangeEvent doesn't stop player's bubbles from decreasing client side

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2022-02-20 09:25:32 +11:00
parent 8d542f0b21
commit 8216743085
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
paper-server/nms-patches/net/minecraft/world/entity/Entity.patch
View file

@ -567,7 +567,7 @@
} }
public int getAirSupply() { public int getAirSupply() {
@@ -2162,7 +2496,17 @@ @@ -2162,7 +2496,18 @@
} }
public void setAirSupply(int i) { public void setAirSupply(int i) {
@ -578,7 +578,8 @@
+ if (this.valid) { + if (this.valid) {
+ event.getEntity().getServer().getPluginManager().callEvent(event); + event.getEntity().getServer().getPluginManager().callEvent(event);
+ } + }
+ if (event.isCancelled()) { + if (event.isCancelled() && this.getAirSupply() != i) {
+ this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
+ return; + return;
+ } + }
+ this.entityData.set(Entity.DATA_AIR_SUPPLY_ID, event.getAmount()); + this.entityData.set(Entity.DATA_AIR_SUPPLY_ID, event.getAmount());
@ -586,7 +587,7 @@
} }
public int getTicksFrozen() { public int getTicksFrozen() {
@@ -2189,11 +2533,41 @@ @@ -2189,11 +2534,41 @@
public void thunderHit(WorldServer worldserver, EntityLightning entitylightning) { public void thunderHit(WorldServer worldserver, EntityLightning entitylightning) {
this.setRemainingFireTicks(this.remainingFireTicks + 1); this.setRemainingFireTicks(this.remainingFireTicks + 1);
@ -630,7 +631,7 @@
} }
public void onAboveBubbleCol(boolean flag) { public void onAboveBubbleCol(boolean flag) {
@@ -2349,15 +2723,38 @@ @@ -2349,15 +2724,38 @@
@Nullable @Nullable
public Entity changeDimension(WorldServer worldserver) { public Entity changeDimension(WorldServer worldserver) {
@ -671,7 +672,7 @@
this.level.getProfiler().popPush("reloading"); this.level.getProfiler().popPush("reloading");
Entity entity = this.getType().create(worldserver); Entity entity = this.getType().create(worldserver);
@@ -2366,9 +2763,17 @@ @@ -2366,9 +2764,17 @@
entity.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, entity.getXRot()); entity.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, entity.getXRot());
entity.setDeltaMovement(shapedetectorshape.speed); entity.setDeltaMovement(shapedetectorshape.speed);
worldserver.addDuringTeleport(entity); worldserver.addDuringTeleport(entity);
@ -679,19 +680,19 @@
- WorldServer.makeObsidianPlatform(worldserver); - WorldServer.makeObsidianPlatform(worldserver);
+ if (worldserver.getTypeKey() == WorldDimension.END) { // CraftBukkit + if (worldserver.getTypeKey() == WorldDimension.END) { // CraftBukkit
+ WorldServer.makeObsidianPlatform(worldserver, this); // CraftBukkit + WorldServer.makeObsidianPlatform(worldserver, this); // CraftBukkit
} + }
+ // CraftBukkit start - Forward the CraftEntity to the new entity + // CraftBukkit start - Forward the CraftEntity to the new entity
+ this.getBukkitEntity().setHandle(entity); + this.getBukkitEntity().setHandle(entity);
+ entity.bukkitEntity = this.getBukkitEntity(); + entity.bukkitEntity = this.getBukkitEntity();
+ +
+ if (this instanceof EntityInsentient) { + if (this instanceof EntityInsentient) {
+ ((EntityInsentient) this).dropLeash(true, false); // Unleash to prevent duping of leads. + ((EntityInsentient) this).dropLeash(true, false); // Unleash to prevent duping of leads.
+ } }
+ // CraftBukkit end + // CraftBukkit end
} }
this.removeAfterChangingDimensions(); this.removeAfterChangingDimensions();
@@ -2389,20 +2794,34 @@ @@ -2389,20 +2795,34 @@
@Nullable @Nullable
protected ShapeDetectorShape findDimensionEntryPoint(WorldServer worldserver) { protected ShapeDetectorShape findDimensionEntryPoint(WorldServer worldserver) {
@ -731,7 +732,7 @@
IBlockData iblockdata = this.level.getBlockState(this.portalEntrancePos); IBlockData iblockdata = this.level.getBlockState(this.portalEntrancePos);
EnumDirection.EnumAxis enumdirection_enumaxis; EnumDirection.EnumAxis enumdirection_enumaxis;
Vec3D vec3d; Vec3D vec3d;
@@ -2419,8 +2838,8 @@ @@ -2419,8 +2839,8 @@
vec3d = new Vec3D(0.5D, 0.0D, 0.0D); vec3d = new Vec3D(0.5D, 0.0D, 0.0D);
} }
@ -742,7 +743,7 @@
} }
} else { } else {
BlockPosition blockposition1; BlockPosition blockposition1;
@@ -2430,8 +2849,15 @@ @@ -2430,8 +2850,15 @@
} else { } else {
blockposition1 = worldserver.getHeightmapPos(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver.getSharedSpawnPos()); blockposition1 = worldserver.getHeightmapPos(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver.getSharedSpawnPos());
} }
@ -759,7 +760,7 @@
} }
} }
@@ -2439,8 +2865,23 @@ @@ -2439,8 +2866,23 @@
return BlockPortalShape.getRelativePosition(blockutil_rectangle, enumdirection_enumaxis, this.position(), this.getDimensions(this.getPose())); return BlockPortalShape.getRelativePosition(blockutil_rectangle, enumdirection_enumaxis, this.position(), this.getDimensions(this.getPose()));
} }
@ -785,7 +786,7 @@
} }
public boolean canChangeDimensions() { public boolean canChangeDimensions() {
@@ -2649,7 +3090,26 @@ @@ -2649,7 +3091,26 @@
} }
public final void setBoundingBox(AxisAlignedBB axisalignedbb) { public final void setBoundingBox(AxisAlignedBB axisalignedbb) {
@ -813,7 +814,7 @@
} }
protected float getEyeHeight(EntityPose entitypose, EntitySize entitysize) { protected float getEyeHeight(EntityPose entitypose, EntitySize entitysize) {
@@ -2933,6 +3393,11 @@ @@ -2933,6 +3394,11 @@
vec3d = vec3d.add(vec3d1); vec3d = vec3d.add(vec3d1);
++k1; ++k1;
} }