Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 19:07:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Airplane)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0098-Stop-squids-floating-on-top-of-water.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 46d6b2fbbcb90a7e7738a1f403d02b9cc384c479..003aefff36185613a195edad1bd0121b8526a90b 100644
index 06097dbb8df50d92c7480e4ce3478e7f5c6560b9..d2ff6445b4afb2b8a5aee1ba5b58b69a438ec8b2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3875,11 +3875,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -24,11 +24,11 @@ index 46d6b2fbbcb90a7e7738a1f403d02b9cc384c479..003aefff36185613a195edad1bd0121b
} else {
- AABB axisalignedbb = this.getBoundingBox().deflate(0.001D);
+ AABB axisalignedbb = getAxisForFluidCheck(); // Purpur
int i = Mth.floor(axisalignedbb.minX);
int j = Mth.ceil(axisalignedbb.maxX);
int k = Mth.floor(axisalignedbb.minY);
// Airplane start - rename
int minBlockX = Mth.floor(axisalignedbb.minX);
int maxBlockX = Mth.ceil(axisalignedbb.maxX);
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 f96def2ebdf114823c322c2d4318d039e20eab97..2affff346a7fe81480e86cb61996039df0569853 100644
index f96def2ebdf114823c322c2d4318d039e20eab97..8b3dfce6c890a44f9bc485bec016c922375fadfb 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
@@ -79,6 +79,12 @@ public class Squid extends WaterAnimal {
@@ -39,7 +39,7 @@ index f96def2ebdf114823c322c2d4318d039e20eab97..2affff346a7fe81480e86cb61996039d
+ @Override
+ public net.minecraft.world.phys.AABB getAxisForFluidCheck() {
+ // 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);
+ }
// Purpur end