Skip to content

Commit 5466418

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 5d3a57d + 1b82f9a commit 5466418

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/main/java/com/github/elic0de/thejpspit/spigot/listener/EventListener.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,17 @@ public void onDrop(PlayerDropItemEvent event) {
129129
}
130130

131131
@EventHandler
132-
public void onDamage(EntityDamageByEntityEvent event) {
132+
public void onDamage(EntityDamageEvent event) {
133133
if (event.getEntity() instanceof Player vitim) {
134134
if (event.getCause() == DamageCause.VOID) {
135-
plugin.getGame().death(PitPlayerManager.getPitPlayer(vitim));
136-
return;
135+
vitim.setHealth(0);
137136
}
137+
}
138+
}
139+
140+
@EventHandler
141+
public void onDamage(EntityDamageByEntityEvent event) {
142+
if (event.getEntity() instanceof Player vitim) {
138143
if (event.getDamager() instanceof Player damager) {
139144
final PitPlayer victimPitPlayer = PitPlayerManager.getPitPlayer(vitim);
140145
final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(damager);

0 commit comments

Comments
 (0)