From 0d0825d61488756a0eefebfc9f3541c396d87136 Mon Sep 17 00:00:00 2001 From: Sauilitired Date: Wed, 24 Sep 2014 20:29:30 +0200 Subject: [PATCH] WorldGuard Support. Fixed NullPointerException in C Added Settings Fixed tons of warning :P Added auto clear --- .idea/artifacts/plotsquared__.xml | 8 - .idea/libraries/WorldGuard.xml | 9 + .idea/workspace.xml | 857 ++++++++---------- PlotSquared/PlotSquared.iml | 1 + .../src/com/intellectualcrafters/plot/C.java | 6 +- .../intellectualcrafters/plot/PlotMain.java | 195 ++-- .../intellectualcrafters/plot/Settings.java | 5 + .../plot/WorldGenerator.java | 32 +- .../plot/commands/Visit.java | 16 +- .../plot/listeners/WorldGuardListener.java | 62 ++ plotsquared.xml | 92 +- 11 files changed, 654 insertions(+), 629 deletions(-) delete mode 100644 .idea/artifacts/plotsquared__.xml create mode 100644 .idea/libraries/WorldGuard.xml create mode 100644 PlotSquared/src/com/intellectualcrafters/plot/listeners/WorldGuardListener.java diff --git a/.idea/artifacts/plotsquared__.xml b/.idea/artifacts/plotsquared__.xml deleted file mode 100644 index 2134bc9a0..000000000 --- a/.idea/artifacts/plotsquared__.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - $PROJECT_DIR$/out/plotsquared - - - - - \ No newline at end of file diff --git a/.idea/libraries/WorldGuard.xml b/.idea/libraries/WorldGuard.xml new file mode 100644 index 000000000..7f65e5da9 --- /dev/null +++ b/.idea/libraries/WorldGuard.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1cf831c20..188308548 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,15 +5,21 @@ - + - - - - - + + + + + + + + + + + @@ -37,138 +43,43 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + - - - + + + + + + + - - + + - - + + @@ -192,7 +103,6 @@ @@ -251,7 +165,6 @@ - @@ -259,6 +172,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -324,138 +351,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -467,10 +365,10 @@ - + - + @@ -512,10 +410,79 @@