1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-17 02:34:30 +01:00

[Auto] Updated Upstream (CraftBukkit/Spigot)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
2f1810812 Improve physics code

Spigot Changes:
c3a49df2 Rebuild patches
This commit is contained in:
Automated 2020-07-06 19:47:11 -04:00
parent bf940a42e0
commit 386cb1c1c9
4 changed files with 4 additions and 4 deletions

View file

@ -615,7 +615,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper end - per player view distance
}
if (!this.isClientSide && (i & 1) != 0) {
if ((i & 1) != 0) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java

View file

@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
// CraftBukkit start
iblockdata1.b(this, blockposition, j); // Don't call an event for the old block to limit event spam
iblockdata1.b(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
CraftWorld world = ((WorldServer) this).getWorld();
- if (world != null) {
+ if (world != null && ((WorldServer)this).hasPhysicsEvent) { // Paper

@ -1 +1 @@
Subproject commit 7a9e4f7aebbdb9c119aa82b2c7988c982d02b13a
Subproject commit 2f18108123a33312a073906cd2a5fe2da18dc049

@ -1 +1 @@
Subproject commit 8918ad0f3ef4002d099b2465dc0d6bbb20891e5a
Subproject commit c3a49df215f30328bf56f08227072c79944760ed