mirrors/SpecialMobs
1
0
Fork 1
mirror of https://github.com/FatherToast/SpecialMobs.git synced 2025-04-24 22:34:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1.16.5' of https://github.com/FatherToast/SpecialMobs into 1.16.5

Browse source
This commit is contained in:
Sarinsa 2022-09-14 01:59:18 +02:00
commit c054269861
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/fathertoast/specialmobs/common/entity/ai/goal/SpecialGhastMeleeAttackGoal.java
View file

@ -68,17 +68,19 @@ public class SpecialGhastMeleeAttackGoal extends Goal {
} }
} }
// Attack the target when able // Attack the target when able
final double rangeDiff = target.distanceToSqr( ghast ) -
((ghast.getBbWidth() * ghast.getBbWidth() + target.getBbWidth() * target.getBbWidth()) / 4.0 + 5.0);
if( attackTimer > 0 ) { if( attackTimer > 0 ) {
attackTimer--; attackTimer--;
} }
else { else if( rangeDiff <= 0 ) {
final double reachSq = (ghast.getBbWidth() * ghast.getBbWidth() + target.getBbWidth() * target.getBbWidth()) / 4.0 + 5.0;
if( target.distanceToSqr( ghast ) < reachSq ) {
attackTimer = 20; attackTimer = 20;
ghast.doHurtTarget( target ); ghast.doHurtTarget( target );
} }
}
ghast.setCharging( attackTimer < 6 && rangeDiff <= 10.0 );
} }
private void setWantedPosition( LivingEntity target ) { private void setWantedPosition( LivingEntity target ) {

2
src/main/java/fathertoast/specialmobs/common/event/PlayerVelocityWatcher.java
View file

@ -64,7 +64,7 @@ public class PlayerVelocityWatcher {
} }
} }
/** Called when the server is starts shutting down. */ /** Called when the server starts shutting down. */
@SubscribeEvent @SubscribeEvent
protected static void onServerStopping( FMLServerStoppingEvent event ) { protected static void onServerStopping( FMLServerStoppingEvent event ) {
cleanupCounter = 0; cleanupCounter = 0;