Dont allow unexpected resource status packets

This commit is contained in:
William Blake Galbreath
2021-07-16 14:28:20 -05:00
parent 0713758d86
commit c64af8769b
13 changed files with 575 additions and 56 deletions

View File

@@ -42,18 +42,18 @@ index 1b8d836607d52c3bc67ad5f2accbc94663637d49..606d5577f121b0103e272bbe4ffa4b58
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index b52cea07a77bd5124881e144483e148cbf5ad54d..d20ccfd3aa974fe84eb675dc040c7e25dbb25920 100644
index c04d22495f38a41aa9ca2477edd7a24df09639e8..a9f5e97f210d64949fcf3c058e132559009a268f 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -258,6 +258,7 @@ public class ServerPlayer extends Player {
public Integer clientViewDistance;
@@ -259,6 +259,7 @@ public class ServerPlayer extends Player {
// CraftBukkit end
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
+ private boolean tpsBar = false;
public boolean acceptingResourcePack = false; // Purpur
+ private boolean tpsBar = false; // Purpur
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -480,6 +481,7 @@ public class ServerPlayer extends Player {
@@ -481,6 +482,7 @@ public class ServerPlayer extends Player {
}
}
@@ -61,7 +61,7 @@ index b52cea07a77bd5124881e144483e148cbf5ad54d..d20ccfd3aa974fe84eb675dc040c7e25
}
@Override
@@ -540,6 +542,7 @@ public class ServerPlayer extends Player {
@@ -541,6 +543,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -69,7 +69,7 @@ index b52cea07a77bd5124881e144483e148cbf5ad54d..d20ccfd3aa974fe84eb675dc040c7e25
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2517,5 +2520,13 @@ public class ServerPlayer extends Player {
@@ -2519,5 +2522,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().moveToWorld(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck);
}
}