mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-01-19 16:59:36 +01:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
5e8a2df4e9
@ -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);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user