Skip to content

Commit 4f683e0

Browse files
committed
fix(listeners): fix NPE in onPlayerDamageEntity
1 parent e50b5b8 commit 4f683e0

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/main/java/uranium/listeners/PlayerListener.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public void onPlayerDropItem(PlayerDropItemEvent event) {
8080
public void onPlayerInteract(PlayerInteractEvent event) {
8181
if (!(event.getAction() == Action.RIGHT_CLICK_BLOCK)) return;
8282
User user = UserManager.getUser(event.getPlayer());
83+
if (user == null) return;
8384
if (!user.isVanished()) return;
8485

8586
if (event.getClickedBlock().getType() == Material.CHEST
@@ -96,6 +97,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
9697
@EventHandler(ignoreCancelled = true)
9798
public void onInventoryClick(InventoryClickEvent event) {
9899
User user = UserManager.getUser((Player) event.getWhoClicked());
100+
if (user == null) return;
99101
if (!user.isVanished()) return;
100102

101103
if (event.getInventory().getType() == InventoryType.CHEST)
@@ -106,6 +108,7 @@ public void onInventoryClick(InventoryClickEvent event) {
106108
public void onPlayerDamageEntity(EntityDamageByEntityEvent event) {
107109
if (!(event.getEntity() instanceof Player) || !(event.getDamager() instanceof Player)) return;
108110
User user = UserManager.getUser((Player) event.getDamager());
111+
if (user == null) return;
109112

110113
if (user.isVanished()) {
111114
event.setCancelled(true);

src/main/resources/plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Uranium
2-
version: 1.0-LITE
2+
version: 1.0.1-LITE
33
main: uranium.Main
44
description: A moderation utility for Eaglercraft 1.8 servers.
55
author: Cold

0 commit comments

Comments
 (0)