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

Fixed Items and XP not dropping on kill

Browse Source
This commit is contained in:
IM23a-spirgif
2025-04-28 13:32:04 +02:00
parent 48f3e5a28b
commit 76c09aa1c8
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/fretux/knockedback/KnockedManager.java
+11 -10
View File
@@ -65,8 +65,8 @@ public class KnockedManager {
Map.Entry<UUID, Integer> entry = it.next();
UUID playerId = entry.getKey();
int timeLeft = entry.getValue();
if ( grippedEntities.contains(playerId)
|| CarryManager.isBeingCarried(playerId) ) {
if (grippedEntities.contains(playerId)
|| CarryManager.isBeingCarried(playerId)) {
ServerPlayer p = NetworkHandlerHelper.getPlayerByUuid(server, playerId);
if (p != null) {
NetworkHandler.CHANNEL.send(
@@ -113,16 +113,17 @@ public class KnockedManager {
@SubscribeEvent
public static void onLivingHurt(LivingHurtEvent event) {
LivingEntity entity = event.getEntity();
DamageSource source = event.getSource();
String damageType = source.getMsgId();
boolean isFatal = entity.getHealth() - event.getAmount() <= 0;
if (!(entity instanceof Player player)) {
return;
}
DamageSource src = event.getSource();
String damageType = src.getMsgId();
boolean isFatal = player.getHealth() - event.getAmount() <= 0;
if (!isKnocked(entity)) {
if (entity instanceof Player player && isFatal) {
if (!(damageType.equals("fall") || damageType.equals("explosion") || damageType.equals("explosion.player") ||
damageType.equals("fire") || damageType.equals("lava") || damageType.equals("onFire") ||
damageType.equals("fireball"))) {
if (isFatal) {
if (src.getEntity() instanceof LivingEntity) {
event.setCanceled(true);
applyKnockedState(player);
applyKnockedState(entity);
}
}
return;