save stuff here

This commit is contained in:
Ben Kerllenevich
2023-06-09 00:01:03 -04:00
parent 0b3c94c72d
commit 8768f54932
159 changed files with 4276 additions and 3663 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player ridable in water option
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 398b1a33ac3be17136a7d38bc35190db1364d10d..ddb36e630c1f1b71c44c31e940c0845ecae14c0b 100644
index a8656e55383739cd694cdf94654ad90890b61095..3661f60cf1be5ecbd5a8a3f07553f2b42b52a4f0 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -2104,6 +2104,11 @@ public abstract class Player extends LivingEntity {
@@ -14,14 +14,14 @@ index 398b1a33ac3be17136a7d38bc35190db1364d10d..ddb36e630c1f1b71c44c31e940c0845e
+ @Override
+ public boolean dismountsUnderwater() {
+ return !level.purpurConfig.playerRidableInWater;
+ return !level().purpurConfig.playerRidableInWater;
+ }
+
public boolean setEntityOnShoulder(CompoundTag entityNbt) {
if (!this.isPassenger() && this.onGround() && !this.isInWater() && !this.isInPowderSnow) {
if (this.getShoulderEntityLeft().isEmpty()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a399db2a142d7bf4de29ca41610f7f02c1f0d2eb..404d45788c3cc84b5ddb99901887286114c17ece 100644
index 62225e7978e9f2982ccba4245c47df53f625043b..b3b08dcacdff3b055345ff5a5056510904488f9a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -400,6 +400,7 @@ public class PurpurWorldConfig {