Skip to content
This repository was archived by the owner on Jun 11, 2021. It is now read-only.

Commit 920ce15

Browse files
committed
Fix NPE when global regions do not exists
1 parent 061c8d3 commit 920ce15

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

src/main/java/com/arzio/deadessentials/module/core/ModuleCoreWorldGuardRegionEvents.java

+15-11
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,14 @@ private void updateRegions(Player player, Location locationFrom, Location locati
7575
}
7676

7777
// Detecting __global__ region Enter event
78-
futureRegions.add(globalTo);
79-
if (!currentPlayerRegions.contains(globalTo)) {
80-
currentPlayerRegions.add(globalTo);
81-
82-
RegionBorderEvent enterEvent = new RegionBorderEvent(globalTo, CrossType.ENTER, player, locationFrom, locationTo);
83-
Bukkit.getPluginManager().callEvent(enterEvent);
78+
if (globalTo != null) {
79+
futureRegions.add(globalTo);
80+
if (!currentPlayerRegions.contains(globalTo)) {
81+
currentPlayerRegions.add(globalTo);
82+
83+
RegionBorderEvent enterEvent = new RegionBorderEvent(globalTo, CrossType.ENTER, player, locationFrom, locationTo);
84+
Bukkit.getPluginManager().callEvent(enterEvent);
85+
}
8486
}
8587

8688
// Detecting Leave event in non-global regions
@@ -97,11 +99,13 @@ private void updateRegions(Player player, Location locationFrom, Location locati
9799
}
98100

99101
// Detecting __global__ region Leave event
100-
if (!futureRegions.contains(globalFrom)) {
101-
currentPlayerRegions.remove(globalFrom);
102-
103-
RegionBorderEvent leaveEvent = new RegionBorderEvent(globalFrom, CrossType.LEAVE, player, locationFrom, locationTo);
104-
Bukkit.getPluginManager().callEvent(leaveEvent);
102+
if (globalFrom != null) {
103+
if (!futureRegions.contains(globalFrom)) {
104+
currentPlayerRegions.remove(globalFrom);
105+
106+
RegionBorderEvent leaveEvent = new RegionBorderEvent(globalFrom, CrossType.LEAVE, player, locationFrom, locationTo);
107+
Bukkit.getPluginManager().callEvent(leaveEvent);
108+
}
105109
}
106110
}
107111

0 commit comments

Comments
 (0)