Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-04 15:31:43 +00:00
Code Issues Releases Activity

add new patches

Browse Source
This commit is contained in:
NONPLAYT
2023-07-16 14:05:55 +03:00
parent a29e4fd3d7
commit 17c6629fb4
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
patches/server/0029-Fix-MC-7569.patch Normal file
View File

@@ -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

33
patches/server/0030-Fix-MC-93018.patch Normal file
View File

@@ -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
}
}