mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Updated Upstream (Paper & Airplane)
Upstream has released updates that appear to apply and compile correctly Paper Changes: 3db3aaf39 [Auto] Updated Upstream (CraftBukkit) c953e51dd [Auto] Updated Upstream (CraftBukkit/Spigot) dc529c7a9 Fix PlayerEditBookEvent (#5463) 3fea87edb [Auto] Updated Upstream (CraftBukkit) a111b1365 Send post ChatEvent messages as MessageType.CHAT d15161114 [Auto] Updated Upstream (Spigot) e8889e96a [Auto] Updated Upstream (CraftBukkit) 3bc888ba6 [Auto] Updated Upstream (CraftBukkit) 211f8e041 Prevent light queue overfill when no players are online Airplane Changes: 3ed988c05 Use AIR library for configuration parsing
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Flying squids! Oh my!
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/EntitySquid.java b/src/main/java/net/minecraft/world/entity/animal/EntitySquid.java
|
||||
index 10e228a36b213a87e17f26a633adfca18a006e94..07b1db0e1fff1beffe464a3984716d5d84ea1873 100644
|
||||
index a9fa18931d93dd7fa428b8cd6a414d4b3a3b4fbb..be48e12dd6c9a390bf383129953bcd3d1f818427 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/EntitySquid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/EntitySquid.java
|
||||
@@ -80,6 +80,11 @@ public class EntitySquid extends EntityWaterAnimal {
|
||||
@@ -81,6 +81,11 @@ public class EntitySquid extends EntityWaterAnimal {
|
||||
vector.setX(cos * x - sine * z);
|
||||
vector.setZ(sine * x + cos * z);
|
||||
}
|
||||
@@ -20,7 +20,7 @@ index 10e228a36b213a87e17f26a633adfca18a006e94..07b1db0e1fff1beffe464a3984716d5d
|
||||
// Purpur end
|
||||
|
||||
@Override
|
||||
@@ -145,6 +150,7 @@ public class EntitySquid extends EntityWaterAnimal {
|
||||
@@ -146,6 +151,7 @@ public class EntitySquid extends EntityWaterAnimal {
|
||||
}
|
||||
|
||||
if (this.aH()) {
|
||||
@@ -28,7 +28,7 @@ index 10e228a36b213a87e17f26a633adfca18a006e94..07b1db0e1fff1beffe464a3984716d5d
|
||||
if (this.bp < 3.1415927F) {
|
||||
float f = this.bp / 3.1415927F;
|
||||
|
||||
@@ -352,7 +358,7 @@ public class EntitySquid extends EntityWaterAnimal {
|
||||
@@ -353,7 +359,7 @@ public class EntitySquid extends EntityWaterAnimal {
|
||||
|
||||
if (i > 100) {
|
||||
this.b.a(0.0F, 0.0F, 0.0F);
|
||||
|
||||
Reference in New Issue
Block a user