Skip to content

Fix le fait de pouvoir attaquer sa propre mascotte #1090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PuppyTransGirl wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix le fait de pouvoir attaquer sa propre mascotte #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b732f6
Fix players being able to attack their own mascot
PuppyTransGirl Nov 16, 2025
966b433
Add doc and remove useless check
PuppyTransGirl Nov 16, 2025
b3570aa
Fix mascots not taking damage correctly
PuppyTransGirl Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/main/java/fr/openmc/core/features/city/sub/mascots/listeners/MascotsDamageListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,13 @@ public class MascotsDamageListener implements Listener {
EntityDamageEvent.DamageCause.LIGHTNING,
EntityDamageEvent.DamageCause.BLOCK_EXPLOSION,
EntityDamageEvent.DamageCause.ENTITY_EXPLOSION,
EntityDamageEvent.DamageCause.FIRE_TICK
EntityDamageEvent.DamageCause.FIRE_TICK,
EntityDamageEvent.DamageCause.ENTITY_ATTACK // Fix le fait de pouvoir attaquer sa propre mascotte
);

@EventHandler
void onMascotDamageCaused(EntityDamageEvent e) {
if (!(e.getEntity() instanceof LivingEntity entity)) return;

if (entity instanceof Player) return;

if (!MascotUtils.canBeAMascot(entity)) return;

EntityDamageEvent.DamageCause cause = e.getCause();
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/fr/openmc/core/features/city/sub/mascots/utils/MascotUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ public static boolean canBeAMascot(Entity entity) {
}

public static void updateDisplayName(LivingEntity entityMascot, Mascot mascot, double damage) {
double newHealth = Math.floor(entityMascot.getHealth());
entityMascot.setHealth(newHealth);
AttributeInstance maxHealthInst = entityMascot.getAttribute(Attribute.MAX_HEALTH);
if (maxHealthInst == null) return;
double maxHealth = maxHealthInst.getValue();
Expand All @@ -81,6 +79,7 @@ public static void updateDisplayName(LivingEntity entityMascot, Mascot mascot, d
healthAfterDamage,
maxHealth
)));
entityMascot.setHealth(healthAfterDamage);
}
}

Expand Down
Loading