Skip to content

Commit 6eabd50

Browse files
committed
Fix server crash when messaging
1 parent 7eaac8e commit 6eabd50

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/main/java/com/lx862/svrutil/feature/FancyMessageFeature.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ public FancyMessageFeature() {
1414
@Override
1515
public void readConfig(JsonObject jsonObject) {
1616
super.readConfig(jsonObject);
17-
messageSound = Identifier.tryParse(JsonHelper.getString(jsonObject, "messageSound", "!"));
17+
messageSound = Identifier.tryParse(JsonHelper.getString(jsonObject, "soundEffect", "!"));
1818
}
1919

2020
@Override
2121
public JsonObject writeConfig() {
2222
JsonObject jsonObject = super.writeConfig();
23-
jsonObject.addProperty("messageSound", messageSound == null ? null : messageSound.toString());
23+
jsonObject.addProperty("soundEffect", messageSound == null ? null : messageSound.toString());
2424
return jsonObject;
2525
}
2626

src/main/java/com/lx862/svrutil/mixin/MessageCommandMixin.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import com.lx862.svrutil.feature.FancyMessageFeature;
66
import com.lx862.svrutil.feature.FeatureSet;
77
import net.minecraft.network.message.SignedMessage;
8+
import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;
9+
import net.minecraft.registry.entry.RegistryEntry;
810
import net.minecraft.server.command.MessageCommand;
911
import net.minecraft.server.command.ServerCommandSource;
1012
import net.minecraft.server.network.ServerPlayerEntity;
@@ -42,7 +44,7 @@ private static void execute(ServerCommandSource source, Collection<ServerPlayerE
4244

4345
Identifier soundEffect = ((FancyMessageFeature)FeatureSet.FANCY_MESSAGE.feature).getMessageSound();
4446
if(soundEffect != null) {
45-
target.playSound(SoundEvent.of(soundEffect), SoundCategory.MASTER, 1, 1);
47+
target.networkHandler.sendPacket(new PlaySoundS2CPacket(RegistryEntry.of(SoundEvent.of(soundEffect)), SoundCategory.MASTER, target.getX(), target.getY(), target.getZ(), 1, 1, target.getWorld().getRandom().nextLong()));
4648
}
4749

4850
if(afk.afkList.containsKey(target.getUuid()) && source.isExecutedByPlayer()) {

0 commit comments

Comments
 (0)