58 lines
3.3 KiB
Diff
58 lines
3.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
Date: Sun, 24 Oct 2021 20:29:45 -0700
|
||
|
|
Subject: [PATCH] Fix issues with mob conversion
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||
|
|
index 116709ba2b298268ac806e6e45f2e910ca600706..1eeaf0cc9b00afd54f38f9cb50404ec9f9ba51f8 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||
|
|
@@ -86,10 +86,15 @@ public class Skeleton extends AbstractSkeleton {
|
||
|
|
}
|
||
|
|
|
||
|
|
protected void doFreezeConversion() {
|
||
|
|
- this.convertTo(EntityType.STRAY, true, org.bukkit.event.entity.EntityTransformEvent.TransformReason.FROZEN, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.FROZEN); // CraftBukkit - add spawn and transform reasons
|
||
|
|
- if (!this.isSilent()) {
|
||
|
|
+ Stray stray = this.convertTo(EntityType.STRAY, true, org.bukkit.event.entity.EntityTransformEvent.TransformReason.FROZEN, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.FROZEN); // CraftBukkit - add spawn and transform reasons // Paper - track result of conversion
|
||
|
|
+ if (stray != null && !this.isSilent()) { // Paper - only send event if conversion succeeded
|
||
|
|
this.level.levelEvent((Player) null, 1048, this.blockPosition(), 0);
|
||
|
|
}
|
||
|
|
+ // Paper start - reset conversion time to prevent event spam
|
||
|
|
+ if (stray == null) {
|
||
|
|
+ this.conversionTime = 300;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java
|
||
|
|
index cbf181b30bae134150933c721f22161e3e9ffca3..12a1cb536d5cb109cac75636369ed1b2bfa3a0a4 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java
|
||
|
|
@@ -105,6 +105,11 @@ public abstract class AbstractPiglin extends Monster {
|
||
|
|
if (entitypigzombie != null) {
|
||
|
|
entitypigzombie.addEffect(new MobEffectInstance(MobEffects.CONFUSION, 200, 0));
|
||
|
|
}
|
||
|
|
+ // Paper start - reset to prevent event spam
|
||
|
|
+ else {
|
||
|
|
+ this.timeInOverworld = 0;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
|
||
|
|
index 61e2841fea6603e3e5fbd004de7ffdfb79fc9981..4a873a278a4dc76d868d789574a7890bf53832d7 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
|
||
|
|
@@ -28,7 +28,7 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton {
|
||
|
|
this.getHandle().conversionTime = -1;
|
||
|
|
this.getHandle().getEntityData().set(net.minecraft.world.entity.monster.Skeleton.DATA_STRAY_CONVERSION_ID, false);
|
||
|
|
} else {
|
||
|
|
- this.getHandle().getSwimAmount(time); // PAIL rename startStrayConversion
|
||
|
|
+ this.getHandle().startFreezeConversion(time); // PAIL rename startStrayConversion // Paper - nope, that's not the right method
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|