Initial 1.18 update

This commit is contained in:
Nassim Jahnke 2022-02-28 22:43:03 -07:00 committed by Jason Penilla
parent 30cb7d0407
commit c2e2281f29
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
556 changed files with 3417 additions and 3610 deletions

View file

@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
massive amounts of surrounding chunks due to large AABB lookups.
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 81aee8c195307fd3cd4a89c29ebb7ebc25436c83..2458619f7f377398322459e00a49f7f49437f9a2 100644
index 3c176d48e6b1a8e165b5860cd443b36c65397ce9..c909163f664875bded56656ad3c0ca6c39265abb 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -791,6 +791,7 @@ public abstract class PlayerList {
@ -22,14 +22,14 @@ index 81aee8c195307fd3cd4a89c29ebb7ebc25436c83..2458619f7f377398322459e00a49f7f4
// CraftBukkit end
+ worldserver1.getChunkSource().addRegionTicket(net.minecraft.server.level.TicketType.POST_TELEPORT, new net.minecraft.world.level.ChunkPos(location.getBlockX() >> 4, location.getBlockZ() >> 4), 1, entityplayer.getId()); // Paper
while (avoidSuffocation && !worldserver1.noCollision(entityplayer1) && entityplayer1.getY() < (double) worldserver1.getMaxBuildHeight()) {
while (avoidSuffocation && !worldserver1.noCollision((Entity) entityplayer1) && entityplayer1.getY() < (double) worldserver1.getMaxBuildHeight()) {
entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6fbbd591873d28dde1ff59ab0ae46f9ce4d6ae31..a3a80ad047dfa9ba1c058eaaf95b76cd3e0ec490 100644
index b254affe962442c9363e41787454697c509c1cab..61fe669b567a3af5bfb6bc1c80f53b6abfde68ce 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -171,6 +171,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -174,6 +174,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
// Paper end
public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper