EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-07-13 02:44:44 +02:00
Code Issues Projects Releases Wiki Activity

Fix NPE

Browse Source
This commit is contained in:
Jesse Boyd
2016-06-05 18:07:41 +10:00
parent 0b1153da21
commit ce23ad5615
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Core/src/main/java/com/intellectualcrafters/plot/PS.java
View File

@ -666,8 +666,8 @@ public class PS {
* @see #removePlotArea(PlotArea) To remove the reference * @see #removePlotArea(PlotArea) To remove the reference
*/ */
public void addPlotArea(PlotArea plotArea) { public void addPlotArea(PlotArea plotArea) {
HashMap<PlotId, Plot> plots = this.plots_tmp.remove(plotArea.toString()); HashMap<PlotId, Plot> plots;
if (plots == null) { if (plots_tmp == null || (plots = plots_tmp.remove(plotArea.toString())) == null) {
if (plotArea.TYPE == 2) { if (plotArea.TYPE == 2) {
plots = this.plots_tmp.get(plotArea.worldname); plots = this.plots_tmp.get(plotArea.worldname);
if (plots != null) { if (plots != null) {
@ -687,8 +687,8 @@ public class PS {
entry.setArea(plotArea); entry.setArea(plotArea);
} }
} }
Set<PlotCluster> clusters = this.clusters_tmp.remove(plotArea.toString()); Set<PlotCluster> clusters;
if (clusters == null) { if (clusters_tmp == null || (clusters = clusters_tmp.remove(plotArea.toString())) == null) {
if (plotArea.TYPE == 2) { if (plotArea.TYPE == 2) {
clusters = this.clusters_tmp.get(plotArea.worldname); clusters = this.clusters_tmp.get(plotArea.worldname);
if (clusters != null) { if (clusters != null) {