Update to 1.18.2

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

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission bypass for portal waiting
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 536552f9764a647246c218c102690db958814348..e4c129f0dcf61bcb5ca5f1afe7486ffe021607d5 100644
index 35431662e92c9ba1f350df7113cdf0239a22d03d..75393ff3aafa01eaa911149d0173da28c236f7c2 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -182,6 +182,7 @@ public abstract class Player extends LivingEntity {
@@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
// Paper end
public int sixRowEnderchestSlotCount = -1; // Purpur
public boolean flyingFallDamage = false; // Purpur
@@ -16,7 +16,7 @@ index 536552f9764a647246c218c102690db958814348..e4c129f0dcf61bcb5ca5f1afe7486ffe
// CraftBukkit start
public boolean fauxSleeping;
@@ -463,7 +464,7 @@ public abstract class Player extends LivingEntity {
@@ -464,7 +465,7 @@ public abstract class Player extends LivingEntity {
@Override
public int getPortalWaitTime() {