|
9 | 9 | import com.github.elic0de.thejpspit.util.NoCollisionUtil; |
10 | 10 | import com.github.elic0de.thejpspit.villager.VillagerNPC; |
11 | 11 | import com.github.elic0de.thejpspit.villager.VillagerNPCManager; |
12 | | -import java.util.Objects; |
13 | | -import java.util.Optional; |
14 | | - |
15 | 12 | import org.bukkit.Bukkit; |
16 | 13 | import org.bukkit.GameMode; |
17 | 14 | import org.bukkit.Location; |
18 | 15 | 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.*; |
24 | 17 | import org.bukkit.event.EventHandler; |
25 | 18 | import org.bukkit.event.Listener; |
26 | 19 | 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.*; |
29 | 21 | 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.*; |
42 | 23 | import org.bukkit.inventory.EquipmentSlot; |
43 | 24 | import org.bukkit.potion.PotionEffect; |
44 | 25 | import org.bukkit.potion.PotionEffectType; |
45 | 26 |
|
| 27 | +import java.util.Objects; |
| 28 | +import java.util.Optional; |
| 29 | + |
46 | 30 | public class EventListener implements Listener { |
47 | 31 |
|
48 | 32 | private final TheJpsPit plugin = TheJpsPit.getInstance(); |
@@ -143,6 +127,7 @@ public void onDamage(EntityDamageEvent event) { |
143 | 127 | if (event.getEntity() instanceof Player vitim) { |
144 | 128 | if (event.getCause() == DamageCause.VOID) { |
145 | 129 | final PitPlayer victimPitPlayer = PitPlayerManager.getPitPlayer(vitim); |
| 130 | + victimPitPlayer.getPlayer().setFallDistance(0); |
146 | 131 | plugin.getGame().death(victimPitPlayer); |
147 | 132 | } |
148 | 133 | } |
@@ -173,7 +158,7 @@ private void onEntityRegainHealth(EntityRegainHealthEvent event) { |
173 | 158 | if (event.getEntity() instanceof Player) { |
174 | 159 | if (event.getRegainReason() == EntityRegainHealthEvent.RegainReason.SATIATED) { |
175 | 160 | TheJpsPit.getInstance().getPitPreferences().ifPresent( |
176 | | - pitPreferences -> event.setAmount(pitPreferences.getAmountRegenHealth())); |
| 161 | + pitPreferences -> event.setAmount(pitPreferences.getAmountRegenHealth())); |
177 | 162 | } |
178 | 163 | } |
179 | 164 | } |
|
0 commit comments