Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-23 08:49:18 +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@04ee5e7 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2023-12-29 22:32:03 +03:00
parent 220e1613f5
commit 0da68fccb5
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = gq.bxteam.divinemc group = gq.bxteam.divinemc
version = 1.20.4-R0.1-SNAPSHOT version = 1.20.4-R0.1-SNAPSHOT
purpurRef = 6f17a3da52ca57ed1647593b8b37e4306fff8b70 purpurRef = 04ee5e7c2831439b9816fb8cc00afff591b2c66c
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

4
patches/server/0009-EMC-Allow-negative-Amplifier-values.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] EMC - Allow negative Amplifier values
diff --git a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java diff --git a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
index 4f2fcbcf90d6f5ee89e35c993a65cae6c5b7ed91..aad5f1865236f85a505f7bbf27ce9bb9bb568eb5 100644 index d94497083f3da89dbef6479ef8f70591e630e3e7..51eacc67a3aff80811f4a6878ce8867dc151d14b 100644
--- a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java --- a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
+++ b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java +++ b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
@@ -376,7 +376,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> { @@ -375,7 +375,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
optional = Optional.empty(); optional = Optional.empty();
} }

4
patches/server/0014-Fix-MC-31819.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-31819
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index f1fe8a0c1ff1514d9a158e18dc6d234d54388573..34e008e2c4d40f2912f437e344d6a149f91cdd20 100644 index 738aca99196c5b88ed5d561d410964c71625578d..33ec0391c98c3d0b102fe4add182d57d43fe039f 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java --- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1889,6 +1889,11 @@ public abstract class Player extends LivingEntity { @@ -1905,6 +1905,11 @@ public abstract class Player extends LivingEntity {
} }
public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) { public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) {

4
patches/server/0026-Do-not-process-chat-commands-before-player-has-joine.patch
View File

@@ -20,7 +20,7 @@ index 9e802fbe8e5f1a3c24cb6bc9254c72a2a0c3fde1..199a49bed6e5d827f8d01212e37f2f1d
} }
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index eaf2cb361f5d700bea07986edd387d7fad1d27e2..ca1bf5e40da0e5f2cbf12ce6ba2833cae08ef842 100644 index 819906c465debe02192084968bf3d17d69cdd8c8..b934e57437ae34f4599ddda6eaa90844a1cf403c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -6,6 +6,7 @@ import com.mojang.authlib.GameProfile; @@ -6,6 +6,7 @@ import com.mojang.authlib.GameProfile;
@@ -31,7 +31,7 @@ index eaf2cb361f5d700bea07986edd387d7fad1d27e2..ca1bf5e40da0e5f2cbf12ce6ba2833ca
import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry; import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry;
import it.unimi.dsi.fastutil.ints.Int2ObjectMaps; import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
@@ -2338,6 +2339,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -2342,6 +2343,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false)); this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
return Optional.empty(); return Optional.empty();