Skip to content

Commit a891a87

Browse files
committed
[update] 落下ダメージを修正
1 parent 465b512 commit a891a87

File tree

1 file changed

+8
-23
lines changed

1 file changed

+8
-23
lines changed

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

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,24 @@
99
import com.github.elic0de.thejpspit.util.NoCollisionUtil;
1010
import com.github.elic0de.thejpspit.villager.VillagerNPC;
1111
import com.github.elic0de.thejpspit.villager.VillagerNPCManager;
12-
import java.util.Objects;
13-
import java.util.Optional;
14-
1512
import org.bukkit.Bukkit;
1613
import org.bukkit.GameMode;
1714
import org.bukkit.Location;
1815
import org.bukkit.Material;
19-
import org.bukkit.entity.Arrow;
20-
import org.bukkit.entity.Entity;
21-
import org.bukkit.entity.Player;
22-
import org.bukkit.entity.Projectile;
23-
import org.bukkit.entity.Villager;
16+
import org.bukkit.entity.*;
2417
import org.bukkit.event.EventHandler;
2518
import org.bukkit.event.Listener;
2619
import org.bukkit.event.block.Action;
27-
import org.bukkit.event.entity.EntityDamageByEntityEvent;
28-
import org.bukkit.event.entity.EntityDamageEvent;
20+
import org.bukkit.event.entity.*;
2921
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
30-
import org.bukkit.event.entity.EntityRegainHealthEvent;
31-
import org.bukkit.event.entity.FoodLevelChangeEvent;
32-
import org.bukkit.event.entity.PlayerDeathEvent;
33-
import org.bukkit.event.entity.ProjectileLaunchEvent;
34-
import org.bukkit.event.player.PlayerDropItemEvent;
35-
import org.bukkit.event.player.PlayerExpChangeEvent;
36-
import org.bukkit.event.player.PlayerInteractEntityEvent;
37-
import org.bukkit.event.player.PlayerInteractEvent;
38-
import org.bukkit.event.player.PlayerItemConsumeEvent;
39-
import org.bukkit.event.player.PlayerItemDamageEvent;
40-
import org.bukkit.event.player.PlayerJoinEvent;
41-
import org.bukkit.event.player.PlayerQuitEvent;
22+
import org.bukkit.event.player.*;
4223
import org.bukkit.inventory.EquipmentSlot;
4324
import org.bukkit.potion.PotionEffect;
4425
import org.bukkit.potion.PotionEffectType;
4526

27+
import java.util.Objects;
28+
import java.util.Optional;
29+
4630
public class EventListener implements Listener {
4731

4832
private final TheJpsPit plugin = TheJpsPit.getInstance();
@@ -143,6 +127,7 @@ public void onDamage(EntityDamageEvent event) {
143127
if (event.getEntity() instanceof Player vitim) {
144128
if (event.getCause() == DamageCause.VOID) {
145129
final PitPlayer victimPitPlayer = PitPlayerManager.getPitPlayer(vitim);
130+
victimPitPlayer.getPlayer().setFallDistance(0);
146131
plugin.getGame().death(victimPitPlayer);
147132
}
148133
}
@@ -173,7 +158,7 @@ private void onEntityRegainHealth(EntityRegainHealthEvent event) {
173158
if (event.getEntity() instanceof Player) {
174159
if (event.getRegainReason() == EntityRegainHealthEvent.RegainReason.SATIATED) {
175160
TheJpsPit.getInstance().getPitPreferences().ifPresent(
176-
pitPreferences -> event.setAmount(pitPreferences.getAmountRegenHealth()));
161+
pitPreferences -> event.setAmount(pitPreferences.getAmountRegenHealth()));
177162
}
178163
}
179164
}

0 commit comments

Comments
 (0)