Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

rebuild server patches

Browse Source
This commit is contained in:
Blast-MC
2024-07-23 22:37:54 -04:00
parent 43c1dcb932
commit 9040f46126
15 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0003-Add-SoundEvent.patch
View File

@@ -84,10 +84,10 @@ index 22fe529890f34f66534c01248f654dc911b44c3b..dfa777529d3eb3cc0a6713c58b91b74c
final ResourceLocation name = asVanilla(sound.name());
final Optional<SoundEvent> soundEvent = BuiltInRegistries.SOUND_EVENT.getOptional(name);
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 798016774df02c3f7ebf909c9cc125f8427a39be..59fbbfc4fbb7501be62935c1aa466c5bec21b358 100644
index 2766ec28f028c0bd672009928bf64c1a6e5d07d6..b012ef12b6ec89ed8281d8b475c87f53fee196c2 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1551,12 +1551,46 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1688,12 +1688,46 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@Override
public void playSeededSound(@Nullable Player source, double x, double y, double z, Holder<SoundEvent> sound, SoundSource category, float volume, float pitch, long seed) {
@@ -137,10 +137,10 @@ index 798016774df02c3f7ebf909c9cc125f8427a39be..59fbbfc4fbb7501be62935c1aa466c5b
@Override
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..071e38a48114b6cb0155c1dbd60628cdc81189e8 100644
index 5980b70e2d7273239245237189b2debcbccfbac3..5174b23c6e04da7a3d833ea3fd191b5956a49809 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2559,7 +2559,20 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -2560,7 +2560,20 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@Override
public void playNotifySound(SoundEvent sound, SoundSource category, float volume, float pitch) {
@@ -163,10 +163,10 @@ index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..071e38a48114b6cb0155c1dbd60628cd
@Override
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index ef177f21d654d69c128f3f39ea58f2d8ee598628..a97b890311e42433b71137e4b8dafdcdac656116 100644
index 43eeb8ce4bc350c2b524ade11ca25d8d4d21bea5..e37555cf68b6c7108297d98cd84616bad9009bd7 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -905,6 +905,9 @@ public abstract class PlayerList {
@@ -907,6 +907,9 @@ public abstract class PlayerList {
isBedSpawn = true;
}
// Paper end - Add PlayerPostRespawnEvent
@@ -177,10 +177,10 @@ index ef177f21d654d69c128f3f39ea58f2d8ee598628..a97b890311e42433b71137e4b8dafdcd
// Added from changeDimension
this.sendAllPlayerInfo(entityplayer); // Update health, etc...
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 54ba25632c2a9e1c93a5b3a0b92e5280864c49d6..d9604fb92476f61f618e2ef6a8aeefe4e9fe7653 100644
index 09bcbc0ae36e4e69fee87a7e0c49acf496117a39..a4b7229f0de89c315fcf0ecdeeb0ff743d1b05fa 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1891,9 +1891,23 @@ public abstract class Player extends LivingEntity {
@@ -1894,9 +1894,23 @@ public abstract class Player extends LivingEntity {
}
// Paper start - send while respecting visibility
private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
@@ -221,10 +221,10 @@ index dcbef04bbaab988096bf416163264833e84d1967..4117f12172d1d67283fab21851bf2d1c
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index bd6fee3e3ad9116802ff8bb57bfa741b881c4057..43ae279d4d7be8b2addd62178189d14f183cdcfb 100644
index 0ab53d46f0b8f3f3791dd01766738522c86932e8..3cb229ba85057aa6cf9a723695935472f0a1c876 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -2204,4 +2204,42 @@ public class CraftEventFactory {
@@ -2238,4 +2238,42 @@ public class CraftEventFactory {
return event;
}
// Paper end - add EntityFertilizeEggEvent