Fix MC-147659 (#8423)
This commit is contained in:
parent
8a4b752fe2
commit
b743144a12
|
@ -18,6 +18,12 @@ https://bugs.mojang.com/browse/MC-244739
|
||||||
https://bugs.mojang.com/browse/MC-243057
|
https://bugs.mojang.com/browse/MC-243057
|
||||||
ignore furnace fuel slot in recipe book click
|
ignore furnace fuel slot in recipe book click
|
||||||
|
|
||||||
|
https://bugs.mojang.com/browse/MC-147659
|
||||||
|
Some witch huts spawn the incorrect cat
|
||||||
|
Note: Marked as Won't Fix, makes 0 sense
|
||||||
|
|
||||||
|
Co-authored-by: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/commands/DeOpCommands.java b/src/main/java/net/minecraft/server/commands/DeOpCommands.java
|
diff --git a/src/main/java/net/minecraft/server/commands/DeOpCommands.java b/src/main/java/net/minecraft/server/commands/DeOpCommands.java
|
||||||
index cca2618d90306eed9894c5fa7b6ed96b68210688..10769c60bd53438d44fbc6192667acdf4cc95594 100644
|
index cca2618d90306eed9894c5fa7b6ed96b68210688..10769c60bd53438d44fbc6192667acdf4cc95594 100644
|
||||||
--- a/src/main/java/net/minecraft/server/commands/DeOpCommands.java
|
--- a/src/main/java/net/minecraft/server/commands/DeOpCommands.java
|
||||||
|
@ -60,6 +66,20 @@ index c17d9a7cb69d3b6ea6e17b689921fa239db3552b..a4690391df0aa26abea1ad92e6143eb1
|
||||||
this.level.playSound((Player) null, (Entity) this, this.getEatingSound(itemstack), SoundSource.NEUTRAL, 1.0F, Mth.randomBetween(this.level.random, 0.8F, 1.2F));
|
this.level.playSound((Player) null, (Entity) this, this.getEatingSound(itemstack), SoundSource.NEUTRAL, 1.0F, Mth.randomBetween(this.level.random, 0.8F, 1.2F));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
|
||||||
|
index 8808cb9f5df43d781cbb9c7943ff2f222e3a6969..f1315693751cd1058620fae52816f312921b50a4 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
|
||||||
|
@@ -87,8 +87,8 @@ public class CatSpawner implements CustomSpawner {
|
||||||
|
if (cat == null) {
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
+ cat.moveTo(pos, 0.0F, 0.0F); // Paper - move up - Fix MC-147659
|
||||||
|
cat.finalizeSpawn(world, world.getCurrentDifficultyAt(pos), MobSpawnType.NATURAL, (SpawnGroupData)null, (CompoundTag)null);
|
||||||
|
- cat.moveTo(pos, 0.0F, 0.0F);
|
||||||
|
world.addFreshEntityWithPassengers(cat);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raids.java b/src/main/java/net/minecraft/world/entity/raid/Raids.java
|
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raids.java b/src/main/java/net/minecraft/world/entity/raid/Raids.java
|
||||||
index fa8fcdfea51a35e4a482d3d7b18159099da62706..feb89eb69994bdd1d2f95d2b9992e69251b2bee7 100644
|
index fa8fcdfea51a35e4a482d3d7b18159099da62706..feb89eb69994bdd1d2f95d2b9992e69251b2bee7 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/raid/Raids.java
|
--- a/src/main/java/net/minecraft/world/entity/raid/Raids.java
|
||||||
|
|
Loading…
Reference in New Issue