mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve Entities in water activation immunity and let items always move

Browse source
This commit is contained in:
Aikar 2020-04-02 03:56:05 -04:00
parent 1dc7c308aa
commit c2d7876a54
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Spigot-Server-Patches/0426-Activation-Range-Improvements.patch
View file

@ -34,7 +34,7 @@ index d522d7238d..3a248dbe37 100644
this.setMot(Vec3D.a); this.setMot(Vec3D.a);
} }
+ // Paper start - ignore movement changes while inactive. + // Paper start - ignore movement changes while inactive.
+ if (isTemporarilyActive && vec3d == getMot() && enummovetype == EnumMoveType.SELF) { + if (isTemporarilyActive && !(entity instanceof EntityItem) && vec3d == getMot() && enummovetype == EnumMoveType.SELF) {
+ setMot(Vec3D.a); + setMot(Vec3D.a);
+ return; + return;
+ } + }
@ -349,7 +349,7 @@ index 92601c581c..f4cb669740 100644
+ if ( (entity.activationType != ActivationType.WATER && entity.inWater && entity.pushedByWater()) || entity.fireTicks > 0 ) // Paper + if ( (entity.activationType != ActivationType.WATER && entity.inWater && entity.pushedByWater()) || entity.fireTicks > 0 ) // Paper
{ {
- return true; - return true;
+ return 1; // Paper + return 100; // Paper
} }
if ( !( entity instanceof EntityArrow ) ) if ( !( entity instanceof EntityArrow ) )
{ {