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

better location for null check

Browse Source
This commit is contained in:
granny
2021-10-10 12:32:38 -07:00
parent 5f67ff684b
commit 91d3e65a73
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/server/0174-Drowning-Settings.patch
View File

@@ -5,15 +5,24 @@ Subject: [PATCH] Drowning Settings
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 3c5347c0d4b65ced4b942504b1cdb8aab53016a5..5df1d6d15b3b19c6e08e2eeb8f045686a3a32fb3 100644 index 3c5347c0d4b65ced4b942504b1cdb8aab53016a5..3a010a01c6cfd5307b1856bb9d70e81cabe45a65 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -525,7 +525,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
// Spigot end
this.entityData = new SynchedEntityData(this);
this.entityData.define(Entity.DATA_SHARED_FLAGS_ID, (byte) 0);
- this.entityData.define(Entity.DATA_AIR_SUPPLY_ID, this.getMaxAirSupply());
+ this.entityData.define(Entity.DATA_AIR_SUPPLY_ID, this.level == null ? 300 : this.getMaxAirSupply()); // Purpur
this.entityData.define(Entity.DATA_CUSTOM_NAME_VISIBLE, false);
this.entityData.define(Entity.DATA_CUSTOM_NAME, Optional.empty());
this.entityData.define(Entity.DATA_SILENT, false);
@@ -2968,7 +2968,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -2968,7 +2968,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
} }
public int getMaxAirSupply() { public int getMaxAirSupply() {
- return 300; - return 300;
+ return this.level == null ? 300 : this.level.purpurConfig.drowningAirTicks; // Purpur + return this.level.purpurConfig.drowningAirTicks; // Purpur
} }
public int getAirSupply() { public int getAirSupply() {