mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-27 02:39:09 +00:00
e1d2ae3390
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@86a6543 Updated Upstream (Paper) PurpurMC/Purpur@2e39567 Re-add missing chunk api calls, fixes #1560 PurpurMC/Purpur@eadfff7 Updated Upstream (Paper)
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
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
|
|
|
|
Original post on Mojira: https://bugs.mojang.com/browse/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 ba6036633c1977b7f41b3bd0dd31370924b4bf35..e6ce9af322adf35074f154d75bea66e7750f4dd7 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
|
@@ -781,14 +781,17 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
|
|
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
|
|
}
|
|
}
|
|
|