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

Updated Upstream (Paper & Pufferfish)

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

Paper Changes:
PaperMC/Paper@13cf546 Fix pumpkin growth modifier (#8517)
PaperMC/Paper@b3b04f2 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8515)

Pufferfish Changes:
pufferfish-gg/Pufferfish@69bd43d Updated Upstream (Paper)
pufferfish-gg/Pufferfish@deb9638 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@eba9164 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@dda277a Updated Upstream (Paper)
This commit is contained in:
BillyGalbreath
2022-10-30 22:27:51 -05:00
parent fff2015d52
commit 0384c21235
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.2-R0.1-SNAPSHOT
paperCommit = aaf5e3997f5bba868834e990ebac7120ab31d0b8
paperCommit = b3b04f2ca109979cd9aebd8e7859decbeeba10d4
org.gradle.caching = true
org.gradle.parallel = true

6
patches/server/0010-Barrels-and-enderchests-6-rows.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Barrels and enderchests 6 rows
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 16154d89a1c67ebc9dc6ecaeb214799e75d16b6f..2da8186b5f34b5cce97512f50323bee091d380ab 100644
index 550e53665ac3a8d1723e432f0cf0b4adbd03270f..c8742e5e7fdb89a2239a4fc52e76a19cf367bff6 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1199,6 +1199,27 @@ public abstract class PlayerList {
@@ -198,10 +198,10 @@ index f52487e1cfcfab1bf22ab2cb52f998283a86e340..da80e16b7886f22da7028a376d8e8b99
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index a2eeaad280569c9ab2c02d2885611db50462bf2b..2bb405c2ddb32604f70328ff1f67b2bafcf6a9cb 100644
index 567449faf1a5d805c44b5a2685904e919f20ade8..b8d7caaf2918d98138097a1ab74d5b229e39703b 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -165,8 +165,19 @@ public class CraftContainer extends AbstractContainerMenu {
@@ -164,8 +164,19 @@ public class CraftContainer extends AbstractContainerMenu {
case PLAYER:
case CHEST:
case ENDER_CHEST:

4
patches/server/0178-Config-for-unverified-username-message.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Config for unverified username message
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index ea9b56fd6ae1d5577da5bd3e0c38abfeec8f3646..d2c8e1e20eb44d4880b1a2beee6f04a7f505c491 100644
index fbd9807e3a9ad555999fa99e06211ecaf455a091..5fc79bc0b053465a59c08ec0e6716fab20979a3d 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -379,7 +379,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
@@ -378,7 +378,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
ServerLoginPacketListenerImpl.this.gameProfile = gameprofile;
ServerLoginPacketListenerImpl.this.state = ServerLoginPacketListenerImpl.State.READY_TO_ACCEPT;
} else {

4
patches/server/0247-Configurable-valid-characters-for-usernames.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable valid characters for usernames
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index d2c8e1e20eb44d4880b1a2beee6f04a7f505c491..0ea7c0f0f3f9be737e7b8e262be8113469912310 100644
index 5fc79bc0b053465a59c08ec0e6716fab20979a3d..3a62b456e1f8ab68e3c34b9d73b822e379afd570 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -253,6 +253,8 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
@@ -252,6 +252,8 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
return false;
}

4
patches/server/0257-Max-joins-per-second.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Max joins per second
When this option is set to true the `max-joins-per-tick` setting in paper.yml will be used per second instead of per tick
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
index af8e4ebee0218e853d49ec6903ac455cfe5f618d..141ea294d12411d58771ea1ad58383e84b6ba048 100644
index 69b8d1276045cd6742770dcedd6246bb1713fd3b..2a71c8e6901944af90c4ad4dfa39dba7fafc0126 100644
--- a/src/main/java/net/minecraft/network/Connection.java
+++ b/src/main/java/net/minecraft/network/Connection.java
@@ -554,11 +554,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -555,11 +555,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper
private static int joinAttemptsThisTick; // Paper
private static int currTick; // Paper