Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Tuinity)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
b1cdc12 Fix block action handling (#6213)
8f94951 Revert "Fix PaperTickList" (#6216)

Tuinity Changes:
e3bc777 Update paper
845a815 Update readme to 1.17.1
ce43ccd Don't load chunks for hasNewCollision
This commit is contained in:
William Blake Galbreath
2021-07-17 20:51:21 -05:00
parent 505548ed21
commit 0d0caaa91f
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
mcVersion = 1.17.1
packageVersion = 1_17_R1
paperCommit = 7f89e963579c9692325f3a4647ca9be0c4e2b60a
paperCommit = 8f949511b8394c4ecbb722e1c969a552c6ac00cc
org.gradle.parallel = true
org.gradle.vfs.watch = false

18
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -12667,7 +12667,7 @@ index 1cc4e0a1f3d8235ef88b48e01ca8b78a263d2676..428d94c60b826ddf3797d6713661dff1
+ */ // Tuinity - replace old loader system
}
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index c5a73dee1c1c4724f01be44399f52cd2f711256c..6d9497655bd568157f83f30c38a0bf254a5330d7 100644
index 6daf49a951fe7fdb04e8b71f00922e1d457b4e84..e87203a01937967f348297a8c924f0313b96fae9 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -47,6 +47,7 @@ import net.minecraft.world.level.storage.LevelStorageSource;
@@ -13661,7 +13661,7 @@ index 8e2bccc3a9ddb17a4978596056189eb776976338..dcba69c0ad3288ddc64dacc58b6fb857
public void doCloseContainer() {
this.containerMenu.removed((Player) this);
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index c607cbae6306bea4eaf9c7abc55c59e92e3304c8..800f6f7c6e7d0d5922fc8b8de2aab72dca8514df 100644
index 1c83fbc96a074c85a3e349e936ff1f3198596709..e97e3b4de132a452d560c19a1dcecd28f8010c62 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -56,14 +56,28 @@ public class ServerPlayerGameMode {
@@ -13726,7 +13726,7 @@ index c607cbae6306bea4eaf9c7abc55c59e92e3304c8..800f6f7c6e7d0d5922fc8b8de2aab72d
float f = state.getDestroyProgress(this.player, this.player.level, pos) * (float) (j + 1);
int k = (int) (f * 10.0F);
@@ -230,7 +250,7 @@ public class ServerPlayerGameMode {
@@ -226,7 +246,7 @@ public class ServerPlayerGameMode {
return;
}
@@ -13735,7 +13735,7 @@ index c607cbae6306bea4eaf9c7abc55c59e92e3304c8..800f6f7c6e7d0d5922fc8b8de2aab72d
float f = 1.0F;
iblockdata = this.level.getBlockState(pos);
@@ -283,12 +303,12 @@ public class ServerPlayerGameMode {
@@ -279,12 +299,12 @@ public class ServerPlayerGameMode {
int j = (int) (f * 10.0F);
this.level.destroyBlockProgress(this.player.getId(), pos, j);
@@ -13750,7 +13750,7 @@ index c607cbae6306bea4eaf9c7abc55c59e92e3304c8..800f6f7c6e7d0d5922fc8b8de2aab72d
iblockdata = this.level.getBlockState(pos);
if (!iblockdata.isAir()) {
@@ -305,12 +325,18 @@ public class ServerPlayerGameMode {
@@ -301,12 +321,18 @@ public class ServerPlayerGameMode {
this.isDestroyingBlock = false;
this.hasDelayedDestroy = true;
this.delayedDestroyPos = pos;
@@ -13770,7 +13770,7 @@ index c607cbae6306bea4eaf9c7abc55c59e92e3304c8..800f6f7c6e7d0d5922fc8b8de2aab72d
} else if (action == ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK) {
this.isDestroyingBlock = false;
if (!Objects.equals(this.destroyPos, pos) && !BlockPos.ZERO.equals(this.destroyPos)) {
@@ -322,7 +348,7 @@ public class ServerPlayerGameMode {
@@ -318,7 +344,7 @@ public class ServerPlayerGameMode {
}
this.level.destroyBlockProgress(this.player.getId(), pos, -1);
@@ -13779,7 +13779,7 @@ index c607cbae6306bea4eaf9c7abc55c59e92e3304c8..800f6f7c6e7d0d5922fc8b8de2aab72d
}
}
@@ -332,7 +358,13 @@ public class ServerPlayerGameMode {
@@ -328,7 +354,13 @@ public class ServerPlayerGameMode {
public void destroyAndAck(BlockPos pos, ServerboundPlayerActionPacket.Action action, String reason) {
if (this.destroyBlock(pos)) {
@@ -14150,7 +14150,7 @@ index 0f6b534a4c789a2f09f6c4624e5d58b99c7ed0e6..fea852674098fe411841d8e5ebeace7d
this.generatingStatus = chunkstatus;
this.writeRadiusCutoff = i;
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 45b57cbd619cec8a77014f977df9778f0ff88917..de56756afcd90eff9a1f7fbfa0feb33e4284c3d7 100644
index 68c3d744717cef8eeb16d640877157340a45e81c..b5b1aab39f881c334aa7f5f0d713f78f7265f41b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -536,6 +536,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -14326,7 +14326,7 @@ index 45b57cbd619cec8a77014f977df9778f0ff88917..de56756afcd90eff9a1f7fbfa0feb33e
+ private boolean hasNewCollision(final ServerLevel world, final Entity entity, final AABB oldBox, final AABB newBox) {
+ final List<AABB> collisions = com.tuinity.tuinity.util.CachedLists.getTempCollisionList();
+ try {
+ com.tuinity.tuinity.util.CollisionUtil.getCollisions(world, entity, newBox, collisions, true, false,
+ com.tuinity.tuinity.util.CollisionUtil.getCollisions(world, entity, newBox, collisions, false, true,
+ true, false, null, null);
+
+ for (int i = 0, len = collisions.size(); i < len; ++i) {

4
patches/server/0005-Ridables.patch
View File

@@ -73,10 +73,10 @@ index 57200e6b419ab0793df6498467325b6d5690c17f..bd787b4122502eacacadd8d47ea5aa5d
+
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index de56756afcd90eff9a1f7fbfa0feb33e4284c3d7..e43239fd04e81b3653c07cc441be1a4036b96b97 100644
index b5b1aab39f881c334aa7f5f0d713f78f7265f41b..757c9f9800de18ca8ece3583222c7d3a765f3bde 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2422,6 +2422,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -2412,6 +2412,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);

4
patches/server/0019-Player-invulnerabilities.patch
View File

@@ -82,10 +82,10 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 8414826f6f9204bdda832efcb00e24ab0115bd59..088045dce7a3a20b6bcbce51594b598819e4508a 100644
index 65fb15671ed2947bc62753bc685656732a96feff..3bd3cb3011e95f5c8123209e37034d7e4224fd47 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1922,12 +1922,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1912,12 +1912,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@Override
public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());

4
patches/server/0022-Alternative-Keepalive-Handling.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 088045dce7a3a20b6bcbce51594b598819e4508a..93f3c06c3f2c702eec13dd842363f5232c270f68 100644
index 3bd3cb3011e95f5c8123209e37034d7e4224fd47..b9fc450c548e20d1f9763d993f3818235bec4bdb 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -38,7 +38,7 @@ index 088045dce7a3a20b6bcbce51594b598819e4508a..93f3c06c3f2c702eec13dd842363f523
if (this.keepAlivePending) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
@@ -3092,6 +3108,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -3082,6 +3098,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {

4
patches/server/0046-Signs-allow-color-codes.patch
View File

@@ -17,10 +17,10 @@ index efa6e02ae06e70f554f21468ec3c2e86bddf88d3..d3277ade753b889ba4420ad68e3539d2
this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 93f3c06c3f2c702eec13dd842363f5232c270f68..4451b0c038f81ac3d6286e0955b65e5d8ab952e1 100644
index b9fc450c548e20d1f9763d993f3818235bec4bdb..0881cddd2a4c382b1d7113fe11a1c6a88be961bc 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3082,11 +3082,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -3072,11 +3072,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
}
}
// Paper end

4
patches/server/0172-Sneak-to-bulk-process-composter.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Sneak to bulk process composter
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index 800f6f7c6e7d0d5922fc8b8de2aab72dca8514df..94f723c00133673890e6da6b5858d10dd4c99bae 100644
index e97e3b4de132a452d560c19a1dcecd28f8010c62..0011b8305a95d5570f85cdac87655e66bbab94f1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -586,7 +586,7 @@ public class ServerPlayerGameMode {
@@ -582,7 +582,7 @@ public class ServerPlayerGameMode {
boolean flag1 = player.isSecondaryUseActive() && flag;
ItemStack itemstack1 = stack.copy();

4
patches/server/0177-Break-individual-slabs-when-sneaking.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Break individual slabs when sneaking
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index 94f723c00133673890e6da6b5858d10dd4c99bae..fcc9f73654857a9cc88a80e2182d12fde9261fd2 100644
index 0011b8305a95d5570f85cdac87655e66bbab94f1..e9b2b0c8f5c61787af3ee3c402e5d65656868422 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -424,6 +424,7 @@ public class ServerPlayerGameMode {
@@ -420,6 +420,7 @@ public class ServerPlayerGameMode {
}
return false;
}

4
patches/server/0204-ShulkerBox-allow-oversized-stacks.patch
View File

@@ -9,10 +9,10 @@ creating an itemstack using the TileEntity's NBT data (how it handles it for
creative players) instead of routing it through the LootableBuilder.
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index fcc9f73654857a9cc88a80e2182d12fde9261fd2..55a9c1d13484c4ce5e3d8f2dd270df01480add87 100644
index e9b2b0c8f5c61787af3ee3c402e5d65656868422..dd5bc68171ce5a67ecf30de65f0c1d280cc88419 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -453,7 +453,7 @@ public class ServerPlayerGameMode {
@@ -449,7 +449,7 @@ public class ServerPlayerGameMode {
block.destroy(this.level, pos, iblockdata);
}

4
patches/server/0223-Armor-click-equip-options.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Armor click equip options
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index 55a9c1d13484c4ce5e3d8f2dd270df01480add87..a513e60c9bf96c6863926b608c0c46706700c096 100644
index dd5bc68171ce5a67ecf30de65f0c1d280cc88419..38323c95dc36e5ead294670ce120114492de37d5 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -503,7 +503,7 @@ public class ServerPlayerGameMode {
@@ -499,7 +499,7 @@ public class ServerPlayerGameMode {
return interactionresultwrapper.getResult();
} else {
player.setItemInHand(hand, itemstack1);