mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
d652384e4a
Upstream has released updates that appears to apply and compile correctly Paper Changes: 1c446c22 Fix CME when adding a passenger during Spawn events (#4616) f3927b25 Fix "Not a string" Map Conversion spam - Fixes #3901 1b64536b Clarify the JavaDocs for Entity.getEntitySpawnReason() in response to #4361 6b22219c Remove unnecessary space for provided plugins, fixes #4608 3ece9036 [CI-SKIP] [Auto] Rebuild Patches 551fac7e Fix deop kicking non-whitelisted player when white list is not enabled faf8eb03 Updated Upstream (CraftBukkit) (#4622)
57 lines
2.5 KiB
Diff
57 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sun, 4 Oct 2020 12:00:42 -0500
|
|
Subject: [PATCH] Flying squids! Oh my!
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
|
|
index c9d2461318..aa294a46e4 100644
|
|
--- a/src/main/java/net/minecraft/server/EntitySquid.java
|
|
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
|
|
@@ -51,6 +51,11 @@ public class EntitySquid extends EntityWaterAnimal {
|
|
vector.setX(cos * x - sine * z);
|
|
vector.setZ(sine * x + cos * z);
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public boolean isInWater() {
|
|
+ return this.inWater || world.purpurConfig.squidsCanFly;
|
|
+ }
|
|
// Purpur end
|
|
|
|
@Override
|
|
@@ -116,6 +121,7 @@ public class EntitySquid extends EntityWaterAnimal {
|
|
}
|
|
|
|
if (this.aG()) {
|
|
+ if (world.purpurConfig.squidsCanFly) setNoGravity(!inWater); // Purpur
|
|
if (this.bp < 3.1415927F) {
|
|
float f = this.bp / 3.1415927F;
|
|
|
|
@@ -323,7 +329,7 @@ public class EntitySquid extends EntityWaterAnimal {
|
|
|
|
if (i > 100) {
|
|
this.b.a(0.0F, 0.0F, 0.0F);
|
|
- } else if (this.b.getRandom().nextInt(50) == 0 || !this.b.inWater || !this.b.eK()) {
|
|
+ } else if (this.b.getRandom().nextInt(50) == 0 || !this.b.isInWater() || !this.b.eK()) { // Purpur
|
|
float f = this.b.getRandom().nextFloat() * 6.2831855F;
|
|
float f1 = MathHelper.cos(f) * 0.2F;
|
|
float f2 = -0.1F + this.b.getRandom().nextFloat() * 0.2F;
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index af7c495da1..9c17475a00 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -861,10 +861,12 @@ public class PurpurWorldConfig {
|
|
public boolean squidRidable = false;
|
|
public boolean squidImmuneToEAR = true;
|
|
public double squidOffsetWaterCheck = 0.0D;
|
|
+ public boolean squidsCanFly = false;
|
|
private void squidSettings() {
|
|
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
|
|
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
|
|
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
|
|
+ squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
|
|
}
|
|
|
|
public boolean spiderRidable = false;
|