Fretux/KnockedBack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor mob handling to update player state on release.

Browse Source
This commit is contained in:
IM23a-spirgif
2025-04-28 10:37:17 +02:00
parent 00ff6491f3
commit b97eb0d88e
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/fretux/knockedback/MobKillHandler.java
+18 -2
View File
@@ -7,7 +7,6 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.AABB;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.network.protocol.game.ClientboundSetPassengersPacket;
import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.TickEvent;
import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -48,7 +47,6 @@ public class MobKillHandler {
public void onMobHurt(LivingHurtEvent event) { public void onMobHurt(LivingHurtEvent event) {
LivingEntity entity = event.getEntity(); LivingEntity entity = event.getEntity();
if (!(entity instanceof Mob mob)) return; if (!(entity instanceof Mob mob)) return;
UUID mobUuid = mob.getUUID(); UUID mobUuid = mob.getUUID();
UUID toRelease = null; UUID toRelease = null;
for (var e : killAttempts.entrySet()) { for (var e : killAttempts.entrySet()) {
@@ -61,6 +59,12 @@ public class MobKillHandler {
killAttempts.remove(toRelease); killAttempts.remove(toRelease);
Player p = getPlayerByUuid(toRelease); Player p = getPlayerByUuid(toRelease);
if (p != null) { if (p != null) {
if (p instanceof ServerPlayer sp) {
NetworkHandler.CHANNEL.send(
PacketDistributor.PLAYER.with(() -> sp),
new ExecutionProgressPacket(0)
);
}
setGripped(p, false); setGripped(p, false);
mob.setTarget(null); mob.setTarget(null);
mob.getNavigation().stop(); mob.getNavigation().stop();
@@ -75,11 +79,23 @@ public class MobKillHandler {
Player knocked = getPlayerByUuid(knockedId); Player knocked = getPlayerByUuid(knockedId);
if (knocked == null || !knocked.isAlive()) continue; if (knocked == null || !knocked.isAlive()) continue;
if (CarryManager.isBeingCarried(knockedId)) { if (CarryManager.isBeingCarried(knockedId)) {
if (knocked instanceof ServerPlayer sp) {
NetworkHandler.CHANNEL.send(
PacketDistributor.PLAYER.with(() -> sp),
new ExecutionProgressPacket(0)
);
}
setGripped(knocked, false); setGripped(knocked, false);
continue; continue;
} }
Mob mob = getMobInRange(knocked); Mob mob = getMobInRange(knocked);
if (mob == null) { if (mob == null) {
if (knocked instanceof ServerPlayer sp) {
NetworkHandler.CHANNEL.send(
PacketDistributor.PLAYER.with(() -> sp),
new ExecutionProgressPacket(0)
);
}
setGripped(knocked, false); setGripped(knocked, false);
continue; continue;
} }