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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
This commit is contained in:
BillyGalbreath
2022-01-23 01:01:36 -06:00
parent f134a20b29
commit 455225ecfc
47 changed files with 206 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/server/0158-Drowning-Settings.patch
View File

@@ -5,32 +5,23 @@ 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
index 8746ed0546ec3f078030109c698f5053fda950c8..3a3c0c9d1854e5784ca436f194ea59fe8939f0ab 100644
index e8c5c8d8dfb17492b116c5f02fe06446b31b0e91..a0f999ee0560e7ce773665e70abddfc2e6b580bb 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -529,7 +529,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
// 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);
@@ -2974,7 +2974,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -2988,7 +2988,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
}
public int getMaxAirSupply() {
- return 300;
+ return this.level.purpurConfig.drowningAirTicks; // Purpur
- return this.maxAirTicks; // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
+ return this.level == null? this.maxAirTicks : this.level.purpurConfig.drowningAirTicks; // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir() // Purpur
}
public int getAirSupply() {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index e00c2b211cc3bf55f58039f4a0872ea59122603b..87ceaf8cac34f9250cb53f814d448001f2559932 100644
index b4cc6b9c94eda63caa4c176a96d7c8babe1284bd..3de96928961351c25af561068643a016c197667b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -419,7 +419,7 @@ public abstract class LivingEntity extends Entity {
@@ -418,7 +418,7 @@ public abstract class LivingEntity extends Entity {
if (flag1) {
this.setAirSupply(this.decreaseAirSupply(this.getAirSupply()));
@@ -39,7 +30,7 @@ index e00c2b211cc3bf55f58039f4a0872ea59122603b..87ceaf8cac34f9250cb53f814d448001
this.setAirSupply(0);
Vec3 vec3d = this.getDeltaMovement();
@@ -431,7 +431,7 @@ public abstract class LivingEntity extends Entity {
@@ -430,7 +430,7 @@ public abstract class LivingEntity extends Entity {
this.level.addParticle(ParticleTypes.BUBBLE, this.getX() + d2, this.getY() + d3, this.getZ() + d4, vec3d.x, vec3d.y, vec3d.z);
}
@@ -49,7 +40,7 @@ index e00c2b211cc3bf55f58039f4a0872ea59122603b..87ceaf8cac34f9250cb53f814d448001
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index dffb0fc28eca9a75f4e4bd30dee33f03f5cb2c86..aa01c1d87121a761a66ca0af164d5f24bd3fd2ed 100644
index a1969d56e5c3088812737c591d6a59fd8875e6b9..4f913ecf1d259badb7eaf584da57ff8327e0e66b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -158,6 +158,15 @@ public class PurpurWorldConfig {