Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

Commit

Permalink
Updated Upstream (ShreddedPaper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

ShreddedPaper Changes:
MultiPaper/ShreddedPaper@35247c2 Move navigating mobs between regions
MultiPaper/ShreddedPaper@aa3b13e Rename to forEachRegionInBoundingBox
MultiPaper/ShreddedPaper@07bbfd0 Synchronize playersSentChunkTo
MultiPaper/ShreddedPaper@1e763bd Fix #13: Add Bukkit.isGlobalTickThread
  • Loading branch information
404Setup committed Aug 3, 2024
1 parent c2667b3 commit 77a1493
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = one.tranic.levelpowered.vine
version = 1.20.6-R0.1-SNAPSHOT
mcVersion = 1.20.6

spRef = 11260a5eb86f5beca5a3e8d312581871d759c5f5
spRef = 1e763bd4e9666997ab93356a0acc74203e1c800e

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0001-Fix-build-and-Rebrand.patch
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ index 727a4e4d5f93bad6f9539e2d742baf77819fafd6..9aaa8989832c238c66eb8c21256309cc
servergui.runFinalizers();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9ee9fd2e57b001fd2c3fe8953c1b106a5225762a..7ede52478a95e7d550ff58413c6c683127fab5c5 100644
index c1f331c0150fa0c2dabb0d7ea24c7614bc1cc8c6..4d9438c2c351058eba536fc05d84f1751226754c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -380,7 +380,7 @@ public final class CraftServer implements Server {
Expand All @@ -348,8 +348,8 @@ index 9ee9fd2e57b001fd2c3fe8953c1b106a5225762a..7ede52478a95e7d550ff58413c6c6831
- // Paper end - Folia reagion threading API
+ // Paper end - Folia region threading API

static {
ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
// ShreddedPaper start - Folia region api
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index e8437d039af0457fc6fc877def12f973ab263735..f1c32f16b763540862595035152c5ddce6dac7af 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ The "distanceToSqr" call is a bit expensive, so avoiding it is pretty nice, arou

We could also check if the x,y,z coordinates are equal, but for now, let's just keep the identity check, which also helps us since Minecraft's code does reuse the original delta movement Vec3 object


diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index f355833ee748e25af228ad9bd3dc06606308e490..60beb21b5bf539fe58b8c6658e15a17125f6dcfe 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
Expand Down

0 comments on commit 77a1493

Please sign in to comment.