Skip to content

Commit 272be7f

Browse files
committed
fix 弓のダメージ
1 parent 4335122 commit 272be7f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.bukkit.GameMode;
1717
import org.bukkit.Location;
1818
import org.bukkit.Material;
19+
import org.bukkit.entity.Arrow;
1920
import org.bukkit.entity.Entity;
2021
import org.bukkit.entity.Player;
2122
import org.bukkit.entity.Villager;
@@ -154,18 +155,17 @@ public void onDamage(EntityDamageByEntityEvent event) {
154155
if (event.getDamager() instanceof Player damager) {
155156
final PitPlayer victimPitPlayer = PitPlayerManager.getPitPlayer(vitim);
156157
final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(damager);
157-
switch (event.getCause()) {
158-
case FALL -> {
159-
damager.stopAllSounds();
160-
event.setCancelled(true);
161-
return;
162-
}
163-
case PROJECTILE -> plugin.getPitPreferences().ifPresent(pitPreferences -> event.setDamage(pitPreferences.getDamageAmount()));
158+
if (event.getCause() == DamageCause.FALL) {
159+
damager.stopAllSounds();
160+
event.setCancelled(true);
161+
return;
164162
}
165-
166163
pitPlayer.showHealth(victimPitPlayer);
167164
victimPitPlayer.setLastDamager(pitPlayer);
168165
}
166+
if (event.getDamager() instanceof Arrow) {
167+
plugin.getPitPreferences().ifPresent(pitPreferences -> event.setDamage(pitPreferences.getDamageAmount()));
168+
}
169169
}
170170
}
171171

0 commit comments

Comments
 (0)