Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-10-03 05:07:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Sauilitired 2015-07-13 21:31:36 +02:00
commit 5e8a2df4e9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
View File

@ -258,14 +258,14 @@ public class DBFunc {
* @param comment * @param comment
*/ */
public static void removeComment(final Plot plot, final PlotComment comment) { public static void removeComment(final Plot plot, final PlotComment comment) {
if (plot.temp) { if (plot != null && plot.temp) {
return; return;
} }
dbManager.removeComment(plot, comment); dbManager.removeComment(plot, comment);
} }
public static void clearInbox(final Plot plot, final String inbox) { public static void clearInbox(final Plot plot, final String inbox) {
if (plot.temp) { if (plot != null && plot.temp) {
return; return;
} }
dbManager.clearInbox(plot, inbox); dbManager.clearInbox(plot, inbox);
@ -276,7 +276,7 @@ public class DBFunc {
* @param comment * @param comment
*/ */
public static void setComment(final Plot plot, final PlotComment comment) { public static void setComment(final Plot plot, final PlotComment comment) {
if (plot.temp) { if (plot != null && plot.temp) {
return; return;
} }
dbManager.setComment(plot, comment); dbManager.setComment(plot, comment);
@ -286,7 +286,7 @@ public class DBFunc {
* @param plot * @param plot
*/ */
public static void getComments(final Plot plot, final String inbox, RunnableVal whenDone) { public static void getComments(final Plot plot, final String inbox, RunnableVal whenDone) {
if (plot.temp) { if (plot != null && plot.temp) {
return; return;
} }
dbManager.getComments(plot, inbox, whenDone); dbManager.getComments(plot, inbox, whenDone);