mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-01 04:32:11 -07: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:
@@ -615,7 +615,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ // Paper end - per player view distance
|
+ // 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
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
|
@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||||
// CraftBukkit start
|
// 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();
|
CraftWorld world = ((WorldServer) this).getWorld();
|
||||||
- if (world != null) {
|
- if (world != null) {
|
||||||
+ if (world != null && ((WorldServer)this).hasPhysicsEvent) { // Paper
|
+ if (world != null && ((WorldServer)this).hasPhysicsEvent) { // Paper
|
||||||
|
Submodule work/CraftBukkit updated: 7a9e4f7aeb...2f18108123
Submodule work/Spigot updated: 8918ad0f3e...c3a49df215
Reference in New Issue
Block a user