mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-11-04 11:13:45 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			7.5.9
			...
			fix/v6/fix
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					504a4a9247 | 
@@ -174,21 +174,9 @@ public class PlotListener {
 | 
			
		||||
            String greeting = plot.getFlag(GreetingFlag.class);
 | 
			
		||||
            if (!greeting.isEmpty()) {
 | 
			
		||||
                if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) {
 | 
			
		||||
                    player.sendMessage(
 | 
			
		||||
                            TranslatableCaption.of("flags.greeting_flag_format"),
 | 
			
		||||
                            Template.of("world", plot.getWorldName()),
 | 
			
		||||
                            Template.of("plot_id", plot.getId().toString()),
 | 
			
		||||
                            Template.of("alias", plot.getAlias()),
 | 
			
		||||
                            Template.of("greeting", greeting)
 | 
			
		||||
                    );
 | 
			
		||||
                    plot.format(StaticCaption.of(greeting), player, false).thenAcceptAsync(player::sendMessage);
 | 
			
		||||
                } else {
 | 
			
		||||
                    player.sendActionBar(
 | 
			
		||||
                            TranslatableCaption.of("flags.greeting_flag_format"),
 | 
			
		||||
                            Template.of("world", plot.getWorldName()),
 | 
			
		||||
                            Template.of("plot_id", plot.getId().toString()),
 | 
			
		||||
                            Template.of("alias", plot.getAlias()),
 | 
			
		||||
                            Template.of("greeting", greeting)
 | 
			
		||||
                    );
 | 
			
		||||
                    plot.format(StaticCaption.of(greeting), player, false).thenAcceptAsync(player::sendActionBar);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
@@ -413,21 +401,9 @@ public class PlotListener {
 | 
			
		||||
                String farewell = plot.getFlag(FarewellFlag.class);
 | 
			
		||||
                if (!farewell.isEmpty()) {
 | 
			
		||||
                    if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) {
 | 
			
		||||
                        player.sendMessage(
 | 
			
		||||
                                TranslatableCaption.of("flags.farewell_flag_format"),
 | 
			
		||||
                                Template.of("world", plot.getWorldName()),
 | 
			
		||||
                                Template.of("plot_id", plot.getId().toString()),
 | 
			
		||||
                                Template.of("alias", plot.getAlias()),
 | 
			
		||||
                                Template.of("farewell", farewell)
 | 
			
		||||
                        );
 | 
			
		||||
                        plot.format(StaticCaption.of(farewell), player, false).thenAcceptAsync(player::sendMessage);
 | 
			
		||||
                    } else {
 | 
			
		||||
                        player.sendActionBar(
 | 
			
		||||
                                TranslatableCaption.of("flags.farewell_flag_format"),
 | 
			
		||||
                                Template.of("world", plot.getWorldName()),
 | 
			
		||||
                                Template.of("plot_id", plot.getId().toString()),
 | 
			
		||||
                                Template.of("alias", plot.getAlias()),
 | 
			
		||||
                                Template.of("farewell", farewell)
 | 
			
		||||
                        );
 | 
			
		||||
                        plot.format(StaticCaption.of(farewell), player, false).thenAcceptAsync(player::sendActionBar);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -620,8 +620,6 @@
 | 
			
		||||
  "flags.flag_error_title": "Flag value must be in the format </red><grey>\"A title\" \"The subtitle\"</grey><red>.",
 | 
			
		||||
  "flags.area_flags": "<prefix><gray>Area flags: </gray><dark_aqua><flags></dark_aqua>",
 | 
			
		||||
  "flags.road_flags": "<prefix><gray>Road flags: </gray><dark_aqua><flags></dark_aqua>",
 | 
			
		||||
  "flags.greeting_flag_format": "<prefix><gold>[<world>;<plot_id>]:</gold> <greeting>",
 | 
			
		||||
  "flags.farewell_flag_format": "<prefix><gold>[<world>;<plot_id>]:</gold> <farewell>",
 | 
			
		||||
  "commands.description.add": "<gray>Allow a user to build in a plot while the plot owner is online.</gray>",
 | 
			
		||||
  "commands.description.alias": "<gray>Set the plot alias.</gray>",
 | 
			
		||||
  "commands.description.area": "<gray>Create a new plot area.</gray>",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user