Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 08:49:28 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Dreeam
2024-05-07 09:15:17 -04:00
parent 593d73f968
commit 0e950b05e9
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=org.galemc.gale
version=1.20.6-R0.1-SNAPSHOT
mcVersion=1.20.6
paperRef=ac3a5471c8dcdc1d0431025781da1d524895c47a
paperRef=89ad61fd00b04db4bbd6124944d0a33c74e53ad9
org.gradle.caching=true
org.gradle.parallel=true

8
patches/server/0033-Improve-container-checking-with-a-bitset.patch
View File

@@ -312,7 +312,7 @@ index 2704389bc3ec6dbbf1b568a4380972f8c0d62d15..d6c2455f41024dd839986cce70fd27d8
}
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
index 02675f15e157ce68506c813b19cf5472bf67bc00..6cec1f6fd6cbcb4080b7601edeaa16e69967813e 100644
index 15fd1fe1b55b6421d2c09e8385c9f69fa0152e56..3450ef306f96ba21bd270ca82ad435b3642c2d54 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
@@ -119,19 +119,7 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co
@@ -415,7 +415,7 @@ index b88aa184cd06a0485146f58a5b61a56a50911209..bf7ec7196d02553bc26caf87213fa241
@Override
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index da30c7fd750aa7b912310368100a5261c189715f..5ba7feada898b27aa651f4dab0595b2ad28b68d0 100644
index 8310d132006043e93c612890514c4c7f3eb1c74d..55a5fad40f39b467ba933b2e0778998a54dbb8b2 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -47,7 +47,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -488,7 +488,7 @@ index da30c7fd750aa7b912310368100a5261c189715f..5ba7feada898b27aa651f4dab0595b2a
if (!item.isEmpty()) {
foundItem = true;
ItemStack origItemStack = item;
@@ -722,7 +748,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -723,7 +749,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
if (HopperBlockEntity.canPlaceItemInContainer(to, stack, slot, side)) {
boolean flag = false;
@@ -497,7 +497,7 @@ index da30c7fd750aa7b912310368100a5261c189715f..5ba7feada898b27aa651f4dab0595b2a
if (itemstack1.isEmpty()) {
// Spigot start - SPIGOT-6693, InventorySubcontainer#setItem
@@ -910,7 +936,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -911,7 +937,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@Override
protected void setItems(NonNullList<ItemStack> inventory) {

6
patches/server/0051-Reduce-hopper-item-checks.patch
View File

@@ -119,7 +119,7 @@ index 5f042e294db605827000123252b0df646968f897..e1cc15f28fe8da23b74ff4504c5b2da2
double getLevelY();
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index 5ba7feada898b27aa651f4dab0595b2ad28b68d0..4f5a1d7dfabdf03f708ad5773a15369bcbe62523 100644
index 55a5fad40f39b467ba933b2e0778998a54dbb8b2..21a1a880d49db917528d919ef7dd5cabbc8e2568 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -11,6 +11,7 @@ import net.minecraft.core.NonNullList;
@@ -138,7 +138,7 @@ index 5ba7feada898b27aa651f4dab0595b2ad28b68d0..4f5a1d7dfabdf03f708ad5773a15369b
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.HopperMenu;
import net.minecraft.world.item.ItemStack;
@@ -588,7 +590,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -589,7 +591,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
} else {
boolean flag = hopper.isGridAligned() && iblockdata.isCollisionShapeFullBlock(world, blockposition) && !iblockdata.is(BlockTags.DOES_NOT_BLOCK_HOPPERS);
@@ -147,7 +147,7 @@ index 5ba7feada898b27aa651f4dab0595b2ad28b68d0..4f5a1d7dfabdf03f708ad5773a15369b
Iterator iterator = HopperBlockEntity.getItemsAtAndAbove(world, hopper).iterator();
while (iterator.hasNext()) {
@@ -897,6 +899,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -898,6 +900,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
return first.getCount() < first.getMaxStackSize() && ItemStack.isSameItemSameComponents(first, second); // Paper - Perf: Optimize Hoppers; used to return true for full itemstacks?!
}

6
patches/server/0083-Replace-throttle-tracker-map-with-optimized-collecti.patch
View File

@@ -33,7 +33,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRA
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
index a57235284cfa2d289b601a53415b205d4193a243..cd9cf7e09d9d271001ef378496fd0955c39bf13e 100644
index 45a2683c9489bee6d67a1f3d702c17f2e9dc02e4..8e90f35218e66690359dac35828a1485a77f34c1 100644
--- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
@@ -1,5 +1,7 @@
@@ -63,7 +63,7 @@ index a57235284cfa2d289b601a53415b205d4193a243..cd9cf7e09d9d271001ef378496fd0955
private static int throttleCounter = 0;
// CraftBukkit end
private static final Component IGNORE_STATUS_REASON = Component.translatable("disconnect.ignoring_status_request");
@@ -82,7 +85,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
@@ -86,7 +89,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
InetAddress address = ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getAddress();
synchronized (ServerHandshakePacketListenerImpl.throttleTracker) {
@@ -72,7 +72,7 @@ index a57235284cfa2d289b601a53415b205d4193a243..cd9cf7e09d9d271001ef378496fd0955
ServerHandshakePacketListenerImpl.throttleTracker.put(address, currentTime);
Component chatmessage = io.papermc.paper.adventure.PaperAdventure.asVanilla(io.papermc.paper.configuration.GlobalConfiguration.get().messages.kick.connectionThrottle); // Paper - Configurable connection throttle kick message
this.connection.send(new ClientboundLoginDisconnectPacket(chatmessage));
@@ -96,13 +99,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
@@ -100,13 +103,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
ServerHandshakePacketListenerImpl.throttleCounter = 0;
// Cleanup stale entries