Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-02-16 20:32:32 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream and Sidestream(s) (Tuinity/Origami/Purpur)

Browse Source 
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
aaef5d7 Updated Upstream (Paper)
31e1268 Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.4
957a2ef Fix chunk object leak

Origami Changes:
d41f0b3 Update Paper to 1.16.4

Purpur Changes:
519ac08 Updated Upstream (Paper)
be5fcdd Fix book bug
21e0b98 Updated Upstream (Paper & Tuinity)
This commit is contained in:
Ivan Pekov 2020-11-15 15:39:13 +02:00
parent 6d0288b041
commit e2d915fabd
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
17 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Origami

@ -1 +1 @@
Subproject commit b2e234153c85a2c3b81340c0793690c75b212cd5
Subproject commit d41f0b3eaaa143e114ec927fe9b470c354255904

2
Purpur

@ -1 +1 @@
Subproject commit f513a2f49b6f9bfa72e74e8aa737bca7cdb87c41
Subproject commit 519ac08d10389f8b3e28892e45d076e296bcaa61

2
Tuinity

@ -1 +1 @@
Subproject commit 4fb7f5d44a1eb0a8593405753a69400fdc00d5e2
Subproject commit aaef5d7fa4052464a9760e06a04c00739ccde7bb

30
patches/server/0001-Yatopia-Server-Fixes.patch
View File

@ -976,10 +976,10 @@ index 9f3608357280a269c655b00feed22ebc29922d52..00000000000000000000000000000000
- if (this.eO()) {
- ++this.bA;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 59d47a9f75450573b26b82b6f432af7bdc46a783..5a940fe2cbe81c89007fe768196cac3b37be8e8a 100644
index 976c44c8eeecc513fa11de55b80317550f621407..5bb47279fdeeeef04f35115c916d24ddb8a098bb 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -919,7 +919,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -920,7 +920,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
ShapeDetectorShape shapedetectorshape = this.a(worldserver);
if (shapedetectorshape != null) {
@ -988,7 +988,7 @@ index 59d47a9f75450573b26b82b6f432af7bdc46a783..5a940fe2cbe81c89007fe768196cac3b
worldserver = shapedetectorshape.world; // CraftBukkit
if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event
if (resourcekey == DimensionManager.OVERWORLD && worldserver.getTypeKey() == DimensionManager.THE_NETHER) { // CraftBukkit
@@ -942,8 +942,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -943,8 +943,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
worldserver = ((CraftWorld) exit.getWorld()).getHandle();
// CraftBukkit end
@ -999,7 +999,7 @@ index 59d47a9f75450573b26b82b6f432af7bdc46a783..5a940fe2cbe81c89007fe768196cac3b
if (true) { // CraftBukkit
this.worldChangeInvuln = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
@@ -960,7 +960,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -961,7 +961,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
worldserver.addPlayerPortal(this);
this.playerConnection.teleport(exit); // CraftBukkit - use internal teleport without event
this.playerConnection.syncPosition(); // CraftBukkit - sync position after changing it (from PortalTravelAgent#findAndteleport)
@ -1252,13 +1252,13 @@ index e10995ec30dd9a10d781b3c1709fd2db5a9becdd..f6ffefd7e356c9c68cb6591cab55de93
// CraftBukkit start
return this.createPortal(blockposition, enumdirection_enumaxis, null, 16);
diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
index c3bd58069d8dbdf36f70f1dafd7c24000f31708b..f915cb4e1110e39178527903ae93508f9459d7ca 100644
index a62c87bceab2c9700a7b3925f208b0ffa2b9b393..1a6c593f5f20fb3a8e87ccb70cd3de7f0dcb0327 100644
--- a/src/main/java/net/minecraft/server/StructureGenerator.java
+++ b/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -143,6 +143,11 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
int j2 = i1 + k * l1;
ChunkCoordIntPair chunkcoordintpair = this.a(structuresettingsfeature, j, seededrandom, i2, j2);
if (!iworldreader.getWorldBorder().isChunkInBounds(chunkcoordintpair.x, chunkcoordintpair.z)) { continue; } // Paper
@@ -151,6 +151,11 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
}
}
// Paper end
+ // Origami start - seed based feature search doesn't load
+ if (iworldreader instanceof World && ((World) iworldreader).origamiConfig.fastFeatureSearchDontLoad) {
+ return chunkcoordintpair.l();
@ -1269,15 +1269,15 @@ index c3bd58069d8dbdf36f70f1dafd7c24000f31708b..f915cb4e1110e39178527903ae93508f
diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java.rej b/src/main/java/net/minecraft/server/StructureGenerator.java.rej
deleted file mode 100644
index 2ae4a20ca763c60c9661661d2ae558bd5b6f79a1..0000000000000000000000000000000000000000
index dd52a8fe4fd46e57a5d1af49ba1965a483cf4fcc..0000000000000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/StructureGenerator.java.rej
+++ /dev/null
@@ -1,13 +0,0 @@
-diff a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java (rejected hunks)
-@@ -143,6 +143,11 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
- int j2 = i1 + k * l1;
- ChunkCoordIntPair chunkcoordintpair = this.a(structuresettingsfeature, j, seededrandom, i2, j2);
- if (!iworldreader.getWorldBorder().isChunkInBounds(chunkcoordintpair.x, chunkcoordintpair.z)) { continue; } // Paper
-@@ -151,6 +151,11 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
- }
- }
- // Paper end
-+ // Origami start - seed based feature search doesn't load
-+ if (iworldreader instanceof World && ((World) iworldreader).origamiConfig.fastFeatureSearchDontLoad) {
-+ return chunkcoordintpair.l();
@ -1287,7 +1287,7 @@ index 2ae4a20ca763c60c9661661d2ae558bd5b6f79a1..00000000000000000000000000000000
- IChunkAccess ichunkaccess = iworldreader.getChunkAt(chunkcoordintpair.x, chunkcoordintpair.z, ChunkStatus.STRUCTURE_STARTS, !(iworldreader instanceof World) || !((World) iworldreader).origamiConfig.onlyFindGeneratedFeatures);
- if (ichunkaccess == null) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 19d98e9eaa25968b49bab6d3d26974c8ae6f56f5..86533746815701288b4dcc85a429c8bcf1b25cb5 100644
index bb7ae7deb67172776e702b80c5f66b526a36a8e6..9626f736353249ceb219ee565efc022fd2a32a93 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -96,6 +96,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
patches/server/0007-Yatopia-configuration.patch
View File

@ -67,7 +67,7 @@ index 9ae1b9b40324da3d7a35bf8bbd6b3bea242f2b73..5e657f5ed9536a6d3e23d840ee57319d
if (this.isFireProof() || this.world.isClientSide) {
this.extinguish();
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 6920d994f54e150a1fc63bc7fc70e71d745faf62..aeb68a66de042d0e4789f095bde072a2f9eff649 100644
index 312ad786861667e02c57d06fd3567e3f8c13cd69..6e20c86977258ddbca59936e28f2f5d04f2944fb 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -188,7 +188,7 @@ public abstract class PlayerList {

4
patches/server/0011-Modify-default-configs.patch
View File

@ -18,10 +18,10 @@ index 6ab0a51b421dc696aec292f2db955311c9cc31e3..82591dcebdbf34649728b60b22d8f78a
TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses"));
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 9a0ade5875c34487a65f82f9380f9d25b4432586..8377af6c217a060e0e9178f11a92ca6a6014316c 100644
index ff0e4447b6574e91bf8815de4e04ce881ed7026d..590fd78ec0751a561305a4ad2190b343fe6d5280 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -592,7 +592,7 @@ public class PaperWorldConfig {
@@ -598,7 +598,7 @@ public class PaperWorldConfig {
}
public boolean cooldownHopperWhenFull = true;

2
patches/server/0022-Optimize-TileEntity-load-unload.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Optimize TileEntity load/unload
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 86533746815701288b4dcc85a429c8bcf1b25cb5..e5bf21983cc3236829af28e63be30493214c0991 100644
index 9626f736353249ceb219ee565efc022fd2a32a93..6422cd2a84203f893fe19e866c02207784b043c8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -42,9 +42,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

4
patches/server/0033-Send-more-packets-immediately.patch
View File

@ -11,10 +11,10 @@ as the server shouldn't really care about those packets - they're not related wi
Additionally, I'm thinking of making those packets send asynchronously.
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index eb6b81d88ff22648adbaba87f7789da444d18af8..f4ed4cbf57446f1008c2234c5ad40d2677756150 100644
index 7a2a8acea90a0e6f08f366c3d397a515f38e5395..d346ecbd67f9ed48a343fdbc7e8b81b0e7dda3d9 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -286,7 +286,11 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -289,7 +289,11 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
return networkManager.isPending || networkManager.protocol != EnumProtocol.PLAY ||
packet instanceof PacketPlayOutKeepAlive ||
packet instanceof PacketPlayOutChat ||

4
patches/server/0038-Highly-optimize-VillagePlace-filtering.patch
View File

@ -50,10 +50,10 @@ index 6fcc7ed7c129e6a33386d65b37cbba4a44e96f0f..dbe6f7d555e8c851faba5cafee8831c5
return StreamSupport.stream(b(i, j, k, l, i1, j1).spliterator(), false);
}
diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
index dcaf9f8574a9c913b64ba3a1d8b02220db720225..3df4ae0f0921670c19abe17a115da428b4a1f534 100644
index 271fddbbf73ca5c0e4e2722d7246c14b778d6072..7d5935be528a17809f778578dd2cc559ad947ddd 100644
--- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
+++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
@@ -116,6 +116,15 @@ public class ChunkCoordIntPair {
@@ -118,6 +118,15 @@ public class ChunkCoordIntPair {
return a(new ChunkCoordIntPair(chunkcoordintpair.x - i, chunkcoordintpair.z - i), new ChunkCoordIntPair(chunkcoordintpair.x + i, chunkcoordintpair.z + i));
}

2
patches/server/0041-Stop-wasting-resources-on-JsonList-get.patch
View File

@ -55,7 +55,7 @@ index 4094ef76b7b05de1bfcc28aa0ef13033abadeb7e..0224a6d0e47e836fa485b39e7b4ce5b8
Throwable throwable = null;
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index aeb68a66de042d0e4789f095bde072a2f9eff649..01b3904fd813f98048396f5b4c041f35d3b395c4 100644
index 6e20c86977258ddbca59936e28f2f5d04f2944fb..ad756029c97bf73594eabb7ef5c803b205477777 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -636,6 +636,7 @@ public abstract class PlayerList {

2
patches/server/0042-ProxyForwardDataEvent.patch
View File

@ -83,7 +83,7 @@ index d987483255195c0bde713a92676baced1eaff2b3..2fa0f21cfa81670f6c3f18f76e7fa8d0
} catch (Exception ex) {
disconnect("Failed to verify username!");
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index f4ed4cbf57446f1008c2234c5ad40d2677756150..5029dec16cd0f509767f69af1967873ef69884c0 100644
index d346ecbd67f9ed48a343fdbc7e8b81b0e7dda3d9..837056fdd8b8125bcfe39a1d49fa6e1797bba708 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -51,6 +51,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {

10
patches/server/0045-Respect-PlayerKickEvent-leaveMessage.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Respect PlayerKickEvent leaveMessage
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index c0ef5a9e1224f2bc55f42e6c879ab7cb21e2eff6..f7afa92333ab173446edafd93eb4845829425b40 100644
index d796f2e5bce4c244bb392185d7810815df964781..b1b22d652f0bc4b6d2bff57438861677e2f12803 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -319,7 +319,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -320,7 +320,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.networkManager.sendPacket(new PacketPlayOutKickDisconnect(ichatbasecomponent), (future) -> {
this.networkManager.close(ichatbasecomponent);
});
@ -17,7 +17,7 @@ index c0ef5a9e1224f2bc55f42e6c879ab7cb21e2eff6..f7afa92333ab173446edafd93eb48458
this.networkManager.stopReading();
MinecraftServer minecraftserver = this.minecraftServer;
NetworkManager networkmanager = this.networkManager;
@@ -1677,6 +1677,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1678,6 +1678,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(IChatBaseComponent ichatbasecomponent) {
@ -29,7 +29,7 @@ index c0ef5a9e1224f2bc55f42e6c879ab7cb21e2eff6..f7afa92333ab173446edafd93eb48458
// CraftBukkit start - Rarely it would send a disconnect line twice
if (this.processedDisconnect) {
return;
@@ -1692,7 +1697,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1693,7 +1698,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
*/
this.player.p();
@ -39,7 +39,7 @@ index c0ef5a9e1224f2bc55f42e6c879ab7cb21e2eff6..f7afa92333ab173446edafd93eb48458
this.minecraftServer.getPlayerList().sendMessage(CraftChatMessage.fromString(quitMessage));
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 01b3904fd813f98048396f5b4c041f35d3b395c4..41fb2bcd6c4a2c99ff5f71d059c5485eaa3a6193 100644
index ad756029c97bf73594eabb7ef5c803b205477777..7a065d4b83259874af07320806b852c9b6adafd2 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -499,6 +499,11 @@ public abstract class PlayerList {

2
patches/server/0053-Respect-rotation-when-respawning.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Respect rotation when respawning
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 41fb2bcd6c4a2c99ff5f71d059c5485eaa3a6193..c097804cc19e88b8425b28a53d1258c929cf52b9 100644
index 7a065d4b83259874af07320806b852c9b6adafd2..c547d7a7ef109e98524762dab91f0795659ebbc6 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -814,7 +814,7 @@ public abstract class PlayerList {

2
patches/server/0059-Configurable-flight-checks.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flight checks
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f7afa92333ab173446edafd93eb4845829425b40..3a022aa9be7778ba26f005a1c9b926c5f311c525 100644
index b1b22d652f0bc4b6d2bff57438861677e2f12803..6a91434cccdc6ad7d7624a4dc39e125a030a173f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -177,7 +177,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

6
patches/server/0064-Use-GlueList-for-some-list-initialisations-in-packet.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Use GlueList for some list initialisations in packets
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 5029dec16cd0f509767f69af1967873ef69884c0..71925ccdd05b2f6cd11c1280b689f680d9b653dd 100644
index 837056fdd8b8125bcfe39a1d49fa6e1797bba708..0197e67f43c015e528faf10970d4c9b70e721f5e 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -268,7 +268,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -271,7 +271,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
if (extra == null || extra.isEmpty()) {
return null;
}
@ -17,7 +17,7 @@ index 5029dec16cd0f509767f69af1967873ef69884c0..71925ccdd05b2f6cd11c1280b689f680
buildExtraPackets0(extra, ret);
return ret;
}
@@ -321,7 +321,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -324,7 +324,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
if (!hasExtraPackets) {
this.packetQueue.add(new NetworkManager.QueuedPacket(packet, genericfuturelistener));
} else {

6
patches/server/0071-Configurable-criterion-triggers.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Configurable criterion triggers
This patch adds toggles for three criterion triggers that are called every tick. These can be very unnecessary, and especially in the case of CriterionTriggerEnterBlock, quite heavy.
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 5a940fe2cbe81c89007fe768196cac3b37be8e8a..ec36a398a0e6b12b2e2d81e05d45ea4d5abcc486 100644
index 5bb47279fdeeeef04f35115c916d24ddb8a098bb..375274c806c3347ff686c898a1ef1b672f99bbb5 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -430,6 +430,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -431,6 +431,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
protected void a(IBlockData iblockdata) {
@ -17,7 +17,7 @@ index 5a940fe2cbe81c89007fe768196cac3b37be8e8a..ec36a398a0e6b12b2e2d81e05d45ea4d
CriterionTriggers.d.a(this, iblockdata);
}
@@ -572,7 +573,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -573,7 +574,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.playerConnection.sendPacket(new PacketPlayOutExperience(this.exp, this.expTotal, this.expLevel));
}

10
patches/server/0076-Configurable-movement-checks.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Configurable movement checks
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 3a022aa9be7778ba26f005a1c9b926c5f311c525..fbeb13887fdc084fb14da3d57a28e736d5e6ba4c 100644
index 6a91434cccdc6ad7d7624a4dc39e125a030a173f..7ca9203b653a46641a223751bb6ff4c375edecde 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -439,7 +439,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -440,7 +440,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
// Paper end
@ -17,7 +17,7 @@ index 3a022aa9be7778ba26f005a1c9b926c5f311c525..fbeb13887fdc084fb14da3d57a28e736
// CraftBukkit end
PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", entity.getDisplayName().getString(), this.player.getDisplayName().getString(), d6, d7, d8);
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
@@ -464,7 +464,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -465,7 +465,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
d10 = d6 * d6 + d7 * d7 + d8 * d8;
boolean flag1 = false;
@ -26,7 +26,7 @@ index 3a022aa9be7778ba26f005a1c9b926c5f311c525..fbeb13887fdc084fb14da3d57a28e736
flag1 = true;
PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", entity.getDisplayName().getString(), this.player.getDisplayName().getString(), Math.sqrt(d10));
}
@@ -1151,7 +1151,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1152,7 +1152,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (!this.player.H() && (!this.player.getWorldServer().getGameRules().getBoolean(GameRules.DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isGliding())) {
float f2 = this.player.isGliding() ? 300.0F : 100.0F;
@ -35,7 +35,7 @@ index 3a022aa9be7778ba26f005a1c9b926c5f311c525..fbeb13887fdc084fb14da3d57a28e736
// CraftBukkit end
PlayerConnection.LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getDisplayName().getString(), d7, d8, d9);
this.a(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch);
@@ -1217,7 +1217,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1218,7 +1218,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
d11 = d7 * d7 + d8 * d8 + d9 * d9;
boolean flag1 = false;