Updated Upstream (Paper & Airplane)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
7a59345eb7 Hide feature seeds in Timings
79e52a51bd Don't log if debug logging isn't enabled. (#6603)
89c648bcd7 Fix log message formatting when classes not owned by plugins use sysout (#6604)
3069eaee04 Fix tick rates map being stored with upper case values instead of lower case (#6587)

Airplane Changes:
1888adc228 Reduce fluid lookups for entities
This commit is contained in:
William Blake Galbreath
2021-09-15 22:15:12 -05:00
parent 91f8009a03
commit 029c607198
7 changed files with 119 additions and 17 deletions

View File

@@ -21,12 +21,12 @@ index 87d01bebbb179eec53323e9e23db011a791660ed..02b79aa6f4c472a9450549b1730f026d
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
index 2affff346a7fe81480e86cb61996039df0569853..12be4a2f25a7def8341acda47d10a256c044aec2 100644
index 8b3dfce6c890a44f9bc485bec016c922375fadfb..3c3a5d7ac95916e066c4ec78c0d3849cd0a9f3e0 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
@@ -85,6 +85,15 @@ public class Squid extends WaterAnimal {
// Stops squids from floating just over the water
return this.getBoundingBox().deflate(0.001D).offsetY(level.purpurConfig.squidOffsetWaterCheck);
return super.getAxisForFluidCheck().offsetY(level.purpurConfig.squidOffsetWaterCheck);
}
+
+ public boolean canFly() {