Skip to content

Commit 33c68e1

Browse files
committed
MC-7569
1 parent d281ca6 commit 33c68e1

File tree

4 files changed

+28
-2
lines changed

4 files changed

+28
-2
lines changed

PATCHED.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
### Server Side (Both)
4242
| Bug ID | Name |
4343
|-------------------------------------------------------|----------------------------------------------------------------------------------------------------|
44+
| [MC-7569](https://bugs.mojang.com/browse/MC-7569) | RCON output has newlines removed *(fabric only)* |
4445
| [MC-14923](https://bugs.mojang.com/browse/MC-14923) | Players can be kicked for spamming in a singleplayer world with cheats disabled |
4546
| [MC-30391](https://bugs.mojang.com/browse/MC-30391) | Chickens, blazes and the wither emit particles when landing from a height, despite falling slowly |
4647
| [MC-69216](https://bugs.mojang.com/browse/MC-69216) | Switching to spectator mode while fishing keeps rod cast |

common/src/main/resources/debugify-common.mixins.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,15 @@
3030
"client.mc233042.DirectConnectScreenMixin",
3131
"client.mc234898.RealmsMainScreenMixin",
3232
"client.mc249059.DownloadingTerrainScreenMixin",
33+
"client.mc26757.ScreenMixin",
3334
"client.mc46766.MinecraftClientMixin",
3435
"client.mc53312.VillagerResemblingModelMixin",
3536
"client.mc79545.InGameHudMixin",
3637
"client.mc80859.HandledScreenMixin",
37-
"client.mc26757.ScreenMixin",
3838
"client.mc93384.LivingEntityMixin"
3939
],
4040
"mixins": [
4141
"server.mc100991.FishingBobberEntityMixin",
42-
"server.mc72151.WolfEntityMixin",
4342
"server.mc100991.ProjectileEntityMixin",
4443
"server.mc119417.ServerPlayerEntityMixin",
4544
"server.mc119754.FireworkRocketEntityMixin",
@@ -59,6 +58,7 @@
5958
"server.mc231743.FlowerPotBlockMixin",
6059
"server.mc30391.LivingEntityMixin",
6160
"server.mc69216.ServerPlayerEntityMixin",
61+
"server.mc72151.WolfEntityMixin",
6262
"server.mc84873.LivingEntityMixin",
6363
"server.mc88371.LandingPhaseMixin",
6464
"server.mc89146.ChunkMixin",
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package cc.woverflow.debugify.fabric.mixins.server.mc7569;
2+
3+
import net.minecraft.server.rcon.RconCommandOutput;
4+
import net.minecraft.text.Text;
5+
import org.spongepowered.asm.mixin.Final;
6+
import org.spongepowered.asm.mixin.Mixin;
7+
import org.spongepowered.asm.mixin.Shadow;
8+
import org.spongepowered.asm.mixin.injection.At;
9+
import org.spongepowered.asm.mixin.injection.Inject;
10+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
11+
12+
import java.util.UUID;
13+
14+
@Mixin(RconCommandOutput.class)
15+
public class RconCommandOutputMixin {
16+
@Shadow @Final private StringBuffer buffer;
17+
18+
@Inject(method = "sendSystemMessage", at = @At("RETURN"))
19+
private void appendNewline(Text message, UUID sender, CallbackInfo ci) {
20+
buffer.append(System.lineSeparator());
21+
}
22+
}

fabric/src/main/resources/debugify.mixins.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@
99
"client": [
1010
"client.mc176559.ClientPlayerInteractionManagerMixin",
1111
"client.mc235035.ClientPlayNetworkHandlerMixin"
12+
],
13+
"mixins": [
14+
"server.mc7569.RconCommandOutputMixin"
1215
]
1316
}

0 commit comments

Comments
 (0)