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

Update to 1.18.2

Browse Source
This commit is contained in:
BillyGalbreath
2022-03-01 17:27:08 -06:00
parent 133b3e1719
commit 90adb4e4af
192 changed files with 1500 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ 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 22263b4ebc98011141afea62fdd75b305255a9c7..8df3bf860fcdb9d3df9dea28c02e37183b6f338c 100644
index 2b873a4677b3323eb99e42273dc87be875f58b6f..b038ce65364d961951836066f8e3ef4b36581093 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2995,7 +2995,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -3029,7 +3029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
}
public int getMaxAirSupply() {
@@ -18,10 +18,10 @@ index 22263b4ebc98011141afea62fdd75b305255a9c7..8df3bf860fcdb9d3df9dea28c02e3718
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 8002bcf918974ab49e7dd1800243be273a5afbe1..327473c23f5cbc0a1ae6c5660a9db0cac8a97537 100644
index bb114e9c8fb06c6530f302f5db5ba90eb048ff05..82ef5fa5ca09fafff3c1720072158a3098b54496 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -418,7 +418,7 @@ public abstract class LivingEntity extends Entity {
@@ -421,7 +421,7 @@ public abstract class LivingEntity extends Entity {
if (flag1) {
this.setAirSupply(this.decreaseAirSupply(this.getAirSupply()));
@@ -30,7 +30,7 @@ index 8002bcf918974ab49e7dd1800243be273a5afbe1..327473c23f5cbc0a1ae6c5660a9db0ca
this.setAirSupply(0);
Vec3 vec3d = this.getDeltaMovement();
@@ -430,7 +430,7 @@ public abstract class LivingEntity extends Entity {
@@ -433,7 +433,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);
}