Drop syncPosition on teleportation patch

I'm not sure it was really helping, and now suspecting it might be causing issues
Movement sucks
This commit is contained in:
Aikar 2020-08-06 22:49:50 -04:00 committed by Daniel Ennis
parent 6f66fa5714
commit adadf16548
77 changed files with 39 additions and 73 deletions

View file

@ -1,34 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 May 2020 14:25:55 -0400
Subject: [PATCH] Sync position on teleportation
We've seen many a cases where the "last good" x/y/z is desynced from
the x/y/z that is checked for moving too fast.
Theory is that when you have multiple movement packets queued up,
and the player is teleported after the first then the 2nd and 3rd come in,
it is triggering a massive movement velocity.
This will ensure that the servers position is synchronized anytime player is teleported.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 0ece15a8457debc7d8343c894b060e81be845488..7fd991fd3994a18625c193aeb15ed521d3b6a447 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -501,6 +501,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.o = this.teleportPos.x;
this.p = this.teleportPos.y;
this.q = this.teleportPos.z;
+ this.syncPosition(); // Paper
if (this.player.H()) {
this.player.I();
}
@@ -1300,6 +1301,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.A = this.e;
this.player.setLocation(d0, d1, d2, f, f1);
+ this.syncPosition(); // Paper
this.player.playerConnection.sendPacket(new PacketPlayOutPosition(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.teleportAwait));
}

View file

@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker
Use the distance map to find candidate players for tracking.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 449a687399f38d3ef79685ff80531cf1212f054a..3bbacebc3397f2c1d695f64bf3f4eb2b89b112b6 100644
index 22ebf74762f543316800016dcca67ebad84d2ec9..af9f906b4eb806c73f8ec98ea562393c2b48419e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -245,6 +245,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -44,7 +44,7 @@ index 9b89c0c8a3f1dada4e9b2aaeed0b92e56229b7ca..0c46297e6ff229538d77b2f481e4ab13
List<Entity> list = this.tracker.getPassengers();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index fb65978d783a91b341658e0ebe393ab77153a0d9..752ef8c1f99c6ef224e4df0c544f7894c2b3d3ab 100644
index 8b7c64c0d2315ba3ad70d0104511bfa9f7a64d35..31ce31936a5100f0512103c70c09d097dac64863 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1527,6 +1527,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -56,7 +56,7 @@ index fb65978d783a91b341658e0ebe393ab77153a0d9..752ef8c1f99c6ef224e4df0c544f7894
return i;
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index da7d4003ef9b9d5959a969eda6d864076666b09e..443d40ea6f2008ed16af801e7216f59ae2042ca4 100644
index ef42536bca76beb2c5002605563854fdf1498c31..d751c3ec9d799a0c2bfe835cae1645287af79ec2 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -145,21 +145,55 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

View file

@ -148,7 +148,7 @@ index eebd4c50a7324250d3ebe7060739a71af4243f72..319059ba31f3614cc59cd4c4e4fa9242
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index ab38ad863d112be39ee676d0ff14fdefe2679048..747657396a855d56a6746a9b827de69ad3710b3d 100644
index b615199b2f44b6e5169113cca7cd48d37ead997a..ca93c9f3ab6ae50eb7dbc825a70620325033ccad 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -113,6 +113,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -192,7 +192,7 @@ index 9cb2ff09da0b8832e58eed4d70741853a25c9011..7f660d3c528f5fb4150e4ee8b2991343
// Paper start
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 443d40ea6f2008ed16af801e7216f59ae2042ca4..15a5c85cab5a5d9e74a577f648258e205fcb6251 100644
index d751c3ec9d799a0c2bfe835cae1645287af79ec2..8b36a14b2896d32f99e788a5db928a4100de3912 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -159,6 +159,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

View file

@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
if any are still running after that delay just as reload does.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 752ef8c1f99c6ef224e4df0c544f7894c2b3d3ab..aaea027a3c3f6797e2c763f0ae7159e2d431049e 100644
index 31ce31936a5100f0512103c70c09d097dac64863..84cd55ae46bd09ba2470998155ba64877b2d4cda 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -773,6 +773,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

View file

@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let
them destroy the worlds End Portals and get on top of the nether easy.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index ac01d492872fde6df2b7113005457c714b91fe44..754e2f84526ce9d9eab1a5a4180be643d030b70a 100644
index 093605fe8e079d9ec973702c55ea6caddf0369f1..3d63215a855c71d257b18a247eb7f0b2d7908bce 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -411,4 +411,17 @@ public class PaperConfig {
@ -54,7 +54,7 @@ index 4f9c6b25f152b348a00dadf4b8f58ec3adc3476e..81725611d5b8c10c05d561984f92dc67
public co.aikar.timings.Timing getTiming() {
if (timing == null) {
diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
index aa4bfc9fe8e917c1c19838b0a7b045a11fc9300b..ff770a3b0e5c4fcccc498ecca51dad9863b0fe0e 100644
index 4c7343a1192dd1a8dc7594b57329e6bb6fefb6b2..7b0cc7833448a9e77e85be10f4e02ce43fdead58 100644
--- a/src/main/java/net/minecraft/server/BlockBase.java
+++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -138,7 +138,7 @@ public abstract class BlockBase {
@ -152,7 +152,7 @@ index 22a19e761fdec68cc9405988b977021a8b6398eb..e408ec8c645e9ceb278a13a5b0de8ecf
this.world.getMethodProfiler().enter("explosion_blocks");
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 302b0eda863dcaf7eeea7b0e1820929a46f44c54..5f81997db78c989e942351e80a0d2558f4b90fcd 100644
index d0e0fb0780e97102d0010f05902cd3218d4b7d3d..a173d2562e0c549184f5e82f112843a9893cb502 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -406,6 +406,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

View file

@ -39,7 +39,7 @@ index 0c46297e6ff229538d77b2f481e4ab13ea14c48e..f75c09d44a19f84588f21a55ea8f0dd8
if (!flag4 && this.o <= 400 && !this.q && this.r == this.tracker.isOnGround()) {
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index f6f77583d398c0a03464b0e318d6a93ab72dd206..9f1fa69912ea05798cffe4f520db92a3a2602dac 100644
index 3711914d59c61b652c6c675812ca5ecc29f95130..31bde9518d8fcda2b0f776db22f7fdbbb2953a64 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -2133,9 +2133,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Ensure safe gateway teleport
diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
index ea61a473d8e47428ed5cd4541a5855f0e2c50815..ce239d2b2fe942915aa093b86343c3740d10e273 100644
index 50bb2ca7235781cd80ecde2bb378f37d67514658..89537dec8ed278e79e078cb2fd3d3e839cdbab59 100644
--- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
+++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
@@ -62,10 +62,14 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Add option for console having all permissions
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 754e2f84526ce9d9eab1a5a4180be643d030b70a..353f453dba9603a45f7dd53d07f0da441331190a 100644
index 3d63215a855c71d257b18a247eb7f0b2d7908bce..f2f0b9f011bf5b5aa7d80c605cc885104bb934f8 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -424,4 +424,9 @@ public class PaperConfig {

View file

@ -12,7 +12,7 @@ to the client, so that it doesn't attempt to calculate them.
This mitigates the frametime impact to a minimum (but it's still there).
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 7f508b9ef616071b1adeef7c00da7f4565ef4ddd..84dc89d961bde16f96dba5cf7f2ce4b85564215a 100644
index fb3b626a3dbeca14a2b89e2480f81e7b45a432d3..7e8e1547337c7da451129a1529d372f27b07e6e5 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -278,7 +278,7 @@ public class Chunk implements IChunkAccess {
@ -25,7 +25,7 @@ index 7f508b9ef616071b1adeef7c00da7f4565ef4ddd..84dc89d961bde16f96dba5cf7f2ce4b8
Object temp = backingSet[index];
if (!(temp instanceof EntityPlayer)) {
diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
index 860dc98ab4f84c470b27726314943936d23fcb79..8d45588ecfa33b8c7335df3db58ed6865b8c956c 100644
index f451c69ce705fcaf564cd3916fca01391dc2fe60..3588fe10017cf2341b9121bbb0438ef3fdf8cda6 100644
--- a/src/main/java/net/minecraft/server/ChunkSection.java
+++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -100,6 +100,7 @@ public class ChunkSection {
@ -37,7 +37,7 @@ index 860dc98ab4f84c470b27726314943936d23fcb79..8d45588ecfa33b8c7335df3db58ed686
return chunksection == Chunk.a || chunksection.c();
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 9f1fa69912ea05798cffe4f520db92a3a2602dac..1147f58c6a0bc153e03a461588efabdfd9ed6357 100644
index 31bde9518d8fcda2b0f776db22f7fdbbb2953a64..f0dc6efce2e0ff053f134993cce94afb9b5cd6f3 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1958,12 +1958,112 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

View file

@ -1130,13 +1130,13 @@ index f0dc6efce2e0ff053f134993cce94afb9b5cd6f3..3292bdcd143995d52f8c983a8984af20
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2223210b6ba0c4a1484bc76aec588fd35251f823..4bc5dfa83aa86275e226514db2d7e880b66e6567 100644
index 4e7319e0bad256ce3213a7e9f3d97e319fad3b1c..cace81e707245ba35be3c6d536b56618045e4c20 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1302,6 +1302,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1300,6 +1300,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.A = this.e;
this.player.setLocation(d0, d1, d2, f, f1);
this.syncPosition(); // Paper
+ this.player.forceCheckHighPriority(); // Paper
this.player.playerConnection.sendPacket(new PacketPlayOutPosition(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.teleportAwait));
}

View file

@ -19,7 +19,7 @@ index 90be8c6091dc590a020721f45c7ff7b137cc806d..faa556d4358bc9890ae80c18ee10c38a
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8f87e5121631dfa50f6cb95d036a700135d21b2c..2b04577c153fc4563e59b67afee12411a5de5314 100644
index c920cfbfdf50bec3a64793bf1058a4c856c3ba7c..a54e3ed06a7a1757d3c4ce96b21bed0177e1fa86 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -302,8 +302,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {

View file

@ -35,7 +35,7 @@ index 5af7e5c815752f2fd2b13c02a905796971401813..6e6534ab25dbebbad5d2ee848edb88eb
+ }
}
diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
index 4c4108705e9d25912e57a7b3c28b4f1abad58377..893c0085bca0a8d77a85dba1cc29f2dec96c56ec 100644
index 705c6e3a47a76509268075078f95871d313f6b76..eaed04f786b3c1e1a136163b096bd6aeeb571023 100644
--- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
+++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
@@ -176,6 +176,27 @@ public abstract class ChunkMapDistance {

View file

@ -44,7 +44,7 @@ index 11c9b740b6b1ff30bd33c188c03f2b77b12faf7b..506e76eecd4be892bdc70367c0ee4d97
printSaveWarning = false;
console.autosavePeriod = configuration.getInt("ticks-per.autosave");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 4210aa793b497889ca732a51b2eadea08d88bfac..65b36a17418ae64b6166704b3d0ecf97df1e9445 100644
index cc7c6204b6dcce766a0d3834f2963304b26107c6..06d8ab61f3636a2c76531356f3d7fd6f6be34225 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -402,9 +402,22 @@ public class CraftWorld implements World {

View file

@ -32,7 +32,7 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
This patch also fixes rail duping and carpet duping.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 353f453dba9603a45f7dd53d07f0da441331190a..741c06a27e664211a7023a6369f8e69cbb41a321 100644
index f2f0b9f011bf5b5aa7d80c605cc885104bb934f8..56e4359ba32339e1bef58061585ff3e12e4215f3 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -429,4 +429,10 @@ public class PaperConfig {

View file

@ -14,10 +14,10 @@ behaviour, we need to move all of this dangerous logic outside
of the move call and into an appropriate place in the tick method.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6bb2b3520362d056d4d75c65764e4c8dbc1417f9..0ada31b7e5d509409d5d0fb9ac2949f79416ef73 100644
index cace81e707245ba35be3c6d536b56618045e4c20..4050fa4b8ed060599fb3c14622737117fb2602df 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1098,6 +1098,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1097,6 +1097,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
this.player.c(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 0ada31b7e5d509409d5d0fb9ac2949f79416ef73..a3a7ee9b69e926e0181301c2714cfe72c50a8599 100644
index 4050fa4b8ed060599fb3c14622737117fb2602df..eb21aefa092d00e5ead2177282170fcf3617808c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2516,9 +2516,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2514,9 +2514,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinautorecipe, this, this.player.getWorldServer());
this.player.resetIdleTimer();
if (!this.player.isSpectator() && this.player.activeContainer.windowId == packetplayinautorecipe.b() && this.player.activeContainer.c(this.player) && this.player.activeContainer instanceof ContainerRecipeBook) {

View file

@ -31,10 +31,10 @@ index 7e13b1cf6d92c3e0f2dab1ba1d42bd4f250e256c..3820acd65f3cd488dba964e6d9c45885
} else {
if (entityhuman.getWorld().isClientSide) {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a3a7ee9b69e926e0181301c2714cfe72c50a8599..4a99a05ef2d01383553e59833a8723f5364168ed 100644
index eb21aefa092d00e5ead2177282170fcf3617808c..e4e001dbbe351b88c186856cbebfe7f3fcd9f0fb 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -613,7 +613,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -612,7 +612,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinsetcommandblock, this, this.player.getWorldServer());
if (!this.minecraftServer.getEnableCommandBlock()) {
this.player.sendMessage(new ChatMessage("advMode.notEnabled"), SystemUtils.b);
@ -43,7 +43,7 @@ index a3a7ee9b69e926e0181301c2714cfe72c50a8599..4a99a05ef2d01383553e59833a8723f5
this.player.sendMessage(new ChatMessage("advMode.notAllowed"), SystemUtils.b);
} else {
CommandBlockListenerAbstract commandblocklistenerabstract = null;
@@ -676,7 +676,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -675,7 +675,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinsetcommandminecart, this, this.player.getWorldServer());
if (!this.minecraftServer.getEnableCommandBlock()) {
this.player.sendMessage(new ChatMessage("advMode.notEnabled"), SystemUtils.b);

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3bbacebc3397f2c1d695f64bf3f4eb2b89b112b6..e5edd801c57e6f678c661193814ce9de07f83b95 100644
index af9f906b4eb806c73f8ec98ea562393c2b48419e..759a91f43c9890602f4bb372eb241ebc0128b310 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1,53 +1,54 @@

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Optimize WorldBorder collision checks and air
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e5edd801c57e6f678c661193814ce9de07f83b95..fcb3d3adae52fd70e856344a727a344cf78cfce3 100644
index 759a91f43c9890602f4bb372eb241ebc0128b310..9b5cad1f1137cb6c73f423dada1ae027218086ca 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -854,7 +854,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

View file

@ -39,7 +39,7 @@ index 4c561181a977fd0244325880bb6a8cd6a54dcacc..8b2755a3b95e472e884976195d1d3551
@Override
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index aaea027a3c3f6797e2c763f0ae7159e2d431049e..67a6fc68c6611dab2a3617d5605d7a9e7d9bee2a 100644
index 84cd55ae46bd09ba2470998155ba64877b2d4cda..3130c68e7318a41e763575b245ee1b5298c92a16 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1520,11 +1520,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -63,10 +63,10 @@ index aaea027a3c3f6797e2c763f0ae7159e2d431049e..67a6fc68c6611dab2a3617d5605d7a9e
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 999ab59d1efc095029baea4d4101eb9b2f80347f..1cc16c20ca03902c3e871a7ec19fab442253da27 100644
index e4e001dbbe351b88c186856cbebfe7f3fcd9f0fb..8c02493bcdb6271870f8f1d558858ee3fb260014 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2780,7 +2780,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2778,7 +2778,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
public void a(PacketPlayInDifficultyChange packetplayindifficultychange) {
PlayerConnectionUtils.ensureMainThread(packetplayindifficultychange, this, this.player.getWorldServer());
if (this.player.k(2) || this.isExemptPlayer()) {

View file

@ -6,7 +6,7 @@ Subject: [PATCH] Paper dumpitem command
Let's you quickly view the item in your hands NBT data
diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
index cc3fc5200f75f80a60b4cbc260e3a0bc4bb3a869..6bfcf86d44559849de66a24471e29d93217698bd 100644
index a12bc81933c15606b7cde46937f504eafc4ff030..d798de637389cc5d5289a6c75304de307b01f493 100644
--- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
@@ -21,7 +21,9 @@ import org.bukkit.command.CommandSender;

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ad92d6d30f0e3280c2e4cab6d0c96280d40ae2ef..b5c595a4b5d74366f4cdc927673ac60923e46e90 100644
index ce823833a0b308aeb11902652157575eabf09e3b..1a61bc7c8a532d11981e47cadfd57e92894bf4dd 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2914,7 +2914,7 @@ public abstract class EntityLiving extends Entity {

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Move range check for block placing up
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index cf83059fec9f11df992827f0c0249243caa9ac33..95d57c6de95eca580ca4e3183db851e5a15de342 100644
index 8c02493bcdb6271870f8f1d558858ee3fb260014..6259ff4a571abb842b4a1b15a43b2b7c3fd5f0ab 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1435,15 +1435,19 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1433,15 +1433,19 @@ public class PlayerConnection implements PacketListenerPlayIn {
BlockPosition blockposition = movingobjectpositionblock.getBlockPosition();
EnumDirection enumdirection = movingobjectpositionblock.getDirection();

View file

@ -6,7 +6,7 @@ Subject: [PATCH] Add missing strikeLighting call to
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 65b36a17418ae64b6166704b3d0ecf97df1e9445..2e0a9e41400a2f11bdaee5053811871a936e922e 100644
index 06d8ab61f3636a2c76531356f3d7fd6f6be34225..ca0ca5e407661c7f2d1aa3c70990abaeedd816df 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2604,6 +2604,7 @@ public class CraftWorld implements World {