diff --git a/divinemc-server/minecraft-patches/sources/net/minecraft/server/rcon/RconConsoleSource.java.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/server/rcon/RconConsoleSource.java.patch new file mode 100644 index 0000000..8711080 --- /dev/null +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/server/rcon/RconConsoleSource.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/server/rcon/RconConsoleSource.java ++++ b/net/minecraft/server/rcon/RconConsoleSource.java +@@ -51,7 +_,7 @@ + + @Override + public void sendSystemMessage(Component component) { +- this.buffer.append(component.getString()); ++ this.buffer.append(component.getString()).append(System.lineSeparator()); // DivineMC - Fix MC-7569 + } + + @Override diff --git a/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch index 8ab6ca2..c1c1c83 100644 --- a/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch @@ -17,6 +17,21 @@ int currentSwingDuration = this.getCurrentSwingDuration(); if (this.swinging) { this.swingTime++; +@@ -3157,7 +_,13 @@ + } + + protected float getFlyingSpeed() { +- return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : 0.02F; ++ // DivineMC start - Fix MC-172801 ++ float flyingSpeed = 0.02F; ++ if (this.getAttributes().hasAttribute(Attributes.FLYING_SPEED)) { ++ flyingSpeed = (float) (this.getAttribute(Attributes.FLYING_SPEED).getValue() * 0.049999999254942D); ++ } ++ return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : flyingSpeed; ++ // DivineMC end - Fix MC-172801 + } + + public float getSpeed() { @@ -3642,6 +_,7 @@ protected void updateFallFlying() { this.checkSlowFallDistance();