From 17c6629fb4afe88bc739ebee00eba275c0aa2d3f Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 16 Jul 2023 14:05:55 +0300
Subject: [PATCH] add new patches

---
 patches/server/0029-Fix-MC-7569.patch  | 19 +++++++++++++++
 patches/server/0030-Fix-MC-93018.patch | 33 ++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 patches/server/0029-Fix-MC-7569.patch
 create mode 100644 patches/server/0030-Fix-MC-93018.patch

diff --git a/patches/server/0029-Fix-MC-7569.patch b/patches/server/0029-Fix-MC-7569.patch
new file mode 100644
index 0000000..043a38f
--- /dev/null
+++ b/patches/server/0029-Fix-MC-7569.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
+Date: Sun, 16 Jul 2023 12:21:09 +0300
+Subject: [PATCH] Fix MC-7569
+
+
+diff --git a/src/main/java/net/minecraft/server/rcon/RconConsoleSource.java b/src/main/java/net/minecraft/server/rcon/RconConsoleSource.java
+index 986beb0f2400b9f1d2fc3637574ddd01b1f07b8e..b97cf411c80f76a27ea83bd80d5f457cff67507c 100644
+--- a/src/main/java/net/minecraft/server/rcon/RconConsoleSource.java
++++ b/src/main/java/net/minecraft/server/rcon/RconConsoleSource.java
+@@ -47,7 +47,7 @@ public class RconConsoleSource implements CommandSource {
+ 
+     @Override
+     public void sendSystemMessage(Component message) {
+-        this.buffer.append(message.getString());
++        this.buffer.append(System.lineSeparator());
+     }
+ 
+     @Override
diff --git a/patches/server/0030-Fix-MC-93018.patch b/patches/server/0030-Fix-MC-93018.patch
new file mode 100644
index 0000000..dd22141
--- /dev/null
+++ b/patches/server/0030-Fix-MC-93018.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
+Date: Sun, 16 Jul 2023 13:51:26 +0300
+Subject: [PATCH] Fix MC-93018
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+index 64bceae4d06b35fcbecb0daca2496ba30e39d995..139550c9aeceaa31c09429e5bff13ddc50ef6827 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+@@ -653,14 +653,17 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+     public boolean canMate(Animal other) {
+         if (other == this) {
+             return false;
+-        } else if (!this.isTame()) {
+-            return false;
+         } else if (!(other instanceof Wolf)) {
+             return false;
+         } else {
+-            Wolf entitywolf = (Wolf) other;
+-
+-            return !entitywolf.isTame() ? false : (entitywolf.isInSittingPose() ? false : this.isInLove() && entitywolf.isInLove());
++            // DivineMC start - Fix MC-93018
++            Wolf wolf = (Wolf) other;
++            if (wolf.isInSittingPose()) {
++                return false;
++            } else {
++                return this.isInLove() && wolf.isInLove();
++            }
++            // DivineMC end
+         }
+     }
+