Fix compile

This commit is contained in:
Aikar 2018-11-01 20:16:12 -04:00
parent 47b9a5d178
commit 0d2b71039e
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE

View file

@ -42,7 +42,7 @@ index 32b90f30d9..6023824e3d 100644
+ protected double pendingX = 0D;
+ protected double pendingY = 0D;
+ protected double pendingZ = 0D;
+ public boolean shouldMergeMovement(int mergeMin, double d0, double d1, double d2) {
+ public boolean shouldMergeMovement(double mergeMin, double d0, double d1, double d2) {
+ return d0 * d0 < mergeMin && d1 * d1 < mergeMin && d2 * d2 < mergeMin;
+ }
+ // Paper end
@ -101,7 +101,7 @@ index e63f4afa9b..1941faaebd 100644
// Paper start
+ @Override
+ public boolean shouldMergeMovement(int mergeMin, double d0, double d1, double d2) {
+ public boolean shouldMergeMovement(double mergeMin, double d0, double d1, double d2) {
+ // Slimes have weird movement bugs when a move is skipped, ideally we can fix this and fix that state
+ return false;
+ }