Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-28 11:19:19 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

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

Purpur Changes:
PurpurMC/Purpur@8af4ea6 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-09-16 20:31:30 +03:00
parent 4d978dfc68
commit d1570efcbc
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
mcVersion = 1.21.1
version = 1.21.1-R0.1-SNAPSHOT
purpurRef = bc7bcbb8dd251d9788566ca8af38bf2f0a96bdbe
purpurRef = 8af4ea6f4637c5aaeeaf10791f2715324b5ccf38
org.gradle.caching = true
org.gradle.parallel = true

4
patches/server/0002-Divine-Configuration.patch
View File

@@ -62,7 +62,7 @@ index 26fbc981ec9acafc7ba1753759375c142261b6ab..fd18ffa8a9d2fb43656f518c879da586
this.generator = gen;
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4414d96702ac13b2759127fb4ce98c4e5439f471..1f3f999c3362c5b5130bf269d1219a7ada26204a 100644
index 479a8422a6786a8ada8536d528e7f57a06c8107a..69b8a9be15462989fac3d5b1f042e2b0d21dba36 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -265,6 +265,8 @@ import net.md_5.bungee.api.chat.BaseComponent; // Spigot
@@ -98,7 +98,7 @@ index 4414d96702ac13b2759127fb4ce98c4e5439f471..1f3f999c3362c5b5130bf269d1219a7a
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -3069,6 +3074,13 @@ public final class CraftServer implements Server {
@@ -3066,6 +3071,13 @@ public final class CraftServer implements Server {
}
// Purpur end

8
patches/server/0049-No-chat-sign.patch
View File

@@ -118,10 +118,10 @@ index cf3a4f60f8cbf40cc7448fd80979f55c0c7cc6ed..08879875184a0335243ad477f2080334
}
diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
index fac2fb82c381d245f77b7288c34920660ac2c3af..b3ca62843b17c536840cb4edb700f9c2602c5371 100644
index 0d6307db1047bb5db7e33aa425fe2564cca93cfb..08cb20cb03e92b617cc2b3e671a4ee5f4346d2f7 100644
--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
@@ -324,10 +324,24 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -329,10 +329,24 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
}
public void send(Packet<?> packet) {
@@ -147,10 +147,10 @@ index fac2fb82c381d245f77b7288c34920660ac2c3af..b3ca62843b17c536840cb4edb700f9c2
if (packet == null || this.processedDisconnect) { // Spigot
return;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 73c6b53ef3db85aa3b2ac31013340878e2dd158d..74a158424ab26088ff9765028fca9e1083203980 100644
index 26ea6c68ed79f07c1fc17a248663c111780417ec..462941b3997e29dedfe0c14d38057a73d21e80e0 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1455,7 +1455,7 @@ public abstract class PlayerList {
@@ -1460,7 +1460,7 @@ public abstract class PlayerList {
}
public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public

10
patches/server/0050-Remove-vanilla-username-check.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove vanilla username check
diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
index cbe2789f8a055550dd7840a7bed980efd65eb9a1..1926d365fa613d0fb3eb34cf4d2df655de71dcd9 100644
index 23181027bb077417655913c29377bed720c9e9c1..429a1b2cd3d479894f91c6b64b5a7f6ee8d59950 100644
--- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
+++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
@@ -271,7 +271,7 @@ public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile {
@@ -293,7 +293,7 @@ public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile {
private static GameProfile createAuthLibProfile(UUID uniqueId, String name) {
Preconditions.checkArgument(name == null || name.length() <= 16, "Name cannot be longer than 16 characters");
@@ -18,10 +18,10 @@ index cbe2789f8a055550dd7840a7bed980efd65eb9a1..1926d365fa613d0fb3eb34cf4d2df655
uniqueId != null ? uniqueId : Util.NIL_UUID,
name != null ? name : ""
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index 5edd8e6bcabe5714c89d4c88f672cc3130c27045..0a5156f1790f9b384ce158444f2f38037e8dd91f 100644
index 19d3423644a6a394743c09eb6935bb7633a329a2..de85c108cfc6cfe3357fc381d145851f5bafdf47 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -169,7 +169,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -174,7 +174,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
public void handleHello(ServerboundHelloPacket packet) {
Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", new Object[0]);
// Paper start - Validate usernames
@@ -32,7 +32,7 @@ index 5edd8e6bcabe5714c89d4c88f672cc3130c27045..0a5156f1790f9b384ce158444f2f3803
&& !this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation) {
Validate.validState(StringUtil.isReasonablePlayerName(packet.name()), "Invalid characters in username", new Object[0]);
diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
index 09b74a2f07deee7ba38f99a7573e63b53adab057..2580a13c80f6a8f6bb35b4c82014628732660019 100644
index 5d16e0269bbdeb5086dbce9f1d51a4dc45150909..883e3a0c281a4872c74df96e2ce51993f5c4ccee 100644
--- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
+++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
@@ -154,8 +154,10 @@ public class DivineConfig {