diff --git a/.gitignore b/.gitignore
index 2f104e978..44b07f9a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,4 +99,5 @@ local.properties
hs_err_pid*
/target
/plotsquared/target
-*.MF
\ No newline at end of file
+*.MF
+PlotSquared/schematic.zip
\ No newline at end of file
diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml
index 5c32816aa..03072d753 100644
--- a/PlotSquared/pom.xml
+++ b/PlotSquared/pom.xml
@@ -8,7 +8,7 @@
UTF-8
PlotSquared
- 2.10.7
+ 2.10.8
PlotSquared
jar
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java
index 5a43683ae..e21e230b2 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java
@@ -111,8 +111,16 @@ public class PlotListener extends APlotListener {
player.setPlayerWeather(getWeatherType(weatherFlag.getValueString()));
}
if ((FlagManager.isBooleanFlag(plot, "titles", Settings.TITLES)) && (C.TITLE_ENTERED_PLOT.s().length() > 2)) {
- final String sTitleMain = C.TITLE_ENTERED_PLOT.s().replaceAll("%x%", plot.id.x + "").replaceAll("%z%", plot.id.y + "").replaceAll("%world%", plot.world + "");
- final String sTitleSub = C.TITLE_ENTERED_PLOT_SUB.s().replaceFirst("%s", getName(plot.owner));
+ Flag greetingFlag = FlagManager.getPlotFlag(plot, "greeting");
+ String greeting;
+ if (greetingFlag != null) {
+ greeting = greetingFlag.getValue() + "";
+ }
+ else {
+ greeting = "";
+ }
+ final String sTitleMain = C.TITLE_ENTERED_PLOT.s().replaceAll("%x%", plot.id.x + "").replaceAll("%z%", plot.id.y + "").replaceAll("%world%", plot.world + "").replaceAll("%greeting%", greeting);
+ final String sTitleSub = C.TITLE_ENTERED_PLOT_SUB.s().replaceFirst("%s", getName(plot.owner)).replaceAll("%greeting%", greeting);
if (AbstractTitle.TITLE_CLASS != null) {
AbstractTitle.TITLE_CLASS.sendTitle(player, sTitleMain, sTitleSub, ChatColor.valueOf(C.TITLE_ENTERED_PLOT_COLOR.s()), ChatColor.valueOf(C.TITLE_ENTERED_PLOT_SUB_COLOR.s()));
}