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

fix some compile errors

Browse Source
This commit is contained in:
granny
2023-03-15 18:03:35 -07:00
parent 6314bddba2
commit 3c0d4f1d84
16 changed files with 593 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0096-Flying-squids-Oh-my.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying squids! Oh my!
diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
index cb79d2c958fbd34f8c8818e7e1c0db8887dd15ba..b6df98797757462f35c306aa4c6ea1585a9a6ddc 100644
index b86329a18dc83073462049da975dd71b9d637ab2..b0581379619a1ac510b1973512f70db0e961a1f3 100644
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
@@ -43,6 +43,11 @@ public class GlowSquid extends Squid {
@@ -39,6 +39,11 @@ public class GlowSquid extends Squid {
public void initAttributes() {
this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.glowSquidMaxHealth);
}
@@ -21,10 +21,10 @@ index cb79d2c958fbd34f8c8818e7e1c0db8887dd15ba..b6df98797757462f35c306aa4c6ea158
@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 0d2da2111b039b02b984705d7adde51ed10d3c9d..eee6224629c81a3a5c0b502de95f79fa9a79378f 100644
index de1bf4aea2661763948aba01d93e7685f3ef73cb..c396874d24ae535b4c07649e303e60b7ab158811 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
@@ -86,6 +86,15 @@ public class Squid extends WaterAnimal {
@@ -81,6 +81,15 @@ public class Squid extends WaterAnimal {
// Stops squids from floating just over the water
return super.getAxisForFluidCheck().offsetY(level.purpurConfig.squidOffsetWaterCheck);
}
@@ -40,7 +40,7 @@ index 0d2da2111b039b02b984705d7adde51ed10d3c9d..eee6224629c81a3a5c0b502de95f79fa
// Purpur end
@Override
@@ -160,6 +169,7 @@ public class Squid extends WaterAnimal {
@@ -155,6 +164,7 @@ public class Squid extends WaterAnimal {
}
if (this.isInWaterOrBubble()) {
@@ -48,7 +48,7 @@ index 0d2da2111b039b02b984705d7adde51ed10d3c9d..eee6224629c81a3a5c0b502de95f79fa
if (this.tentacleMovement < 3.1415927F) {
float f = this.tentacleMovement / 3.1415927F;
@@ -319,7 +329,7 @@ public class Squid extends WaterAnimal {
@@ -314,7 +324,7 @@ public class Squid extends WaterAnimal {
if (i > 100) {
this.squid.setMovementVector(0.0F, 0.0F, 0.0F);