EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v5' into v5

Browse Source
This commit is contained in:
Alexander Söderberg 2020-04-18 02:28:29 +02:00
commit c206de263b
No known key found for this signature in database
GPG Key ID: C0207FF7EA146678
7 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
View File

@ -935,11 +935,15 @@ public class PlayerEvents extends PlotListener implements Listener {
PlotPlayer plotPlayer = BukkitUtil.getPlayer(event.getPlayer());
Location location = plotPlayer.getLocation();
PlotArea area = location.getPlotArea();
if (area == null || !area.isPlotChat() || !plotPlayer.getAttribute("chat")) {
if (area == null) {
return;
}
Plot plot = area.getPlot(location);
if (plot == null || !plot.getFlag(ChatFlag.class)) {
if (plot == null) {
return;
}
if (!((plot.getFlag(ChatFlag.class) && area.isPlotChat() && plotPlayer.getAttribute("chat"))
|| area.isForcingPlotChat())) {
return;
}
if (plot.isDenied(plotPlayer.getUUID())) {

2
Bukkit/src/main/resources/plugin.yml
View File

@ -4,7 +4,7 @@ api-version: "1.13"
version: "${version}"
load: STARTUP
description: "Easy, yet powerful Plot World generation and management."
authors: [Citymonstret, Empire92, MattBDev, dordsor21, NotMyFault]
authors: [Citymonstret, Empire92, MattBDev, dordsor21, NotMyFault, SirYwell]
website: https://github.com/IntellectualSites/
softdepend: [Vault, PlaceholderAPI]
loadbefore: [MultiWorld, Multiverse-Core]

3
Core/src/main/java/com/plotsquared/core/command/Caps.java
View File

@ -46,7 +46,7 @@ import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE;
@CommandDeclaration(command = "caps",
category = CommandCategory.INFO,
description = "Show plot mob caps",
description = "Show plot entity caps",
usage = "/plot caps")
public class Caps extends SubCommand {
@ -80,5 +80,4 @@ public class Caps extends SubCommand {
.replace("%current%", Integer.toString(current))
.replace("%limit%", Integer.toString(max)).replace("%percentage%", percentage));
}
}

12
Core/src/main/java/com/plotsquared/core/command/Chat.java
View File

@ -25,18 +25,24 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.MainUtil;
@CommandDeclaration(command = "chat",
description = "Toggle plot chat on or off",
usage = "/plot chat [on|off]",
description = "Toggles plot chat on or off",
usage = "/plot chat",
permission = "plots.chat",
category = CommandCategory.CHAT,
requiredType = RequiredType.PLAYER)
public class Chat extends SubCommand {
@Override public boolean onCommand(PlotPlayer player, String[] args) {
MainCommand.getInstance().toggle.chat(this, player, new String[0], null, null);
if (player.getPlotAreaAbs().isForcingPlotChat()) {
MainUtil.sendMessage(player, Captions.PLOT_CHAT_FORCED);
return true;
}
MainCommand.getInstance().toggle.chat(this, player, args, null, null);
return true;
}
}

2
Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
View File

@ -45,7 +45,7 @@ public class PluginCmd extends SubCommand {
"$2>> $1&l" + PlotSquared.imp().getPluginName() + " $2($1Version$2: $1%s$2)",
PlotSquared.get().getVersion()));
MainUtil.sendMessage(player,
"$2>> $1&lAuthors$2: $1Citymonstret $2& $1Empire92 $2& $1MattBDev $2& $1dordsor21 $2& $1NotMyFault");
"$2>> $1&lAuthors$2: $1Citymonstret $2& $1Empire92 $2& $1MattBDev $2& $1dordsor21 $2& $1NotMyFault $2& $1SirYwell");
MainUtil.sendMessage(player,
"$2>> $1&lWiki$2: $1https://github.com/IntellectualSites/PlotSquared/wiki");
MainUtil.sendMessage(player, "$2>> $1&lPremium$2: $1" + PremiumVerification.isPremium());

2
Core/src/main/java/com/plotsquared/core/configuration/Captions.java
View File

@ -604,7 +604,7 @@ public enum Captions implements Caption {
+ " set to `default` to use the gamemode default, and `false` to disable flight entirely.", "Flags"),
FLAG_DESCRIPTION_UNTRUSTED("Set to `false` to disallow untrusted players from visiting the plot.", "Flags"),
FLAG_DESCRIPTION_DENY_EXIT("Set to `true` to disallow players from exiting the plot.", "Flags"),
FLAG_DESCRIPTION_CHAT("Set to `false` to prevent plot chat on the plot .", "Flags"),
FLAG_DESCRIPTION_CHAT("Set to `false` to prevent plot chat on the plot.", "Flags"),
FLAG_DESCRIPTION_DESCRIPTION("Plot description. Supports '&' color codes.", "Flags"),
FLAG_DESCRIPTION_GREETING("Message sent to players on plot entry. Supports '&' color codes.", "Flags"),
FLAG_DESCRIPTION_FAREWELL("Message sent to players when leaving the plot. Supports '&' color codes.", "Flags"),

5
Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
View File

@ -100,7 +100,8 @@ public abstract class PlotArea {
@Getter private boolean mobSpawning = false;
@Getter private boolean mobSpawnerSpawning = false;
@Getter private BiomeType plotBiome = BiomeTypes.FOREST;
@Getter private boolean plotChat = false;
@Getter private boolean plotChat = true;
@Getter private boolean forcingPlotChat = false;
@Getter private boolean schematicClaimSpecify = false;
@Getter private boolean schematicOnClaim = false;
@Getter private String schematicFile = "null";
@ -276,6 +277,7 @@ public abstract class PlotArea {
}
}
this.plotChat = config.getBoolean("chat.enabled");
this.forcingPlotChat = config.getBoolean("chat.forced");
this.worldBorder = config.getBoolean("world.border");
this.maxBuildHeight = config.getInt("world.max_height");
this.minBuildHeight = config.getInt("world.min_height");
@ -389,6 +391,7 @@ public abstract class PlotArea {
options.put("economy.prices.merge", 100);
options.put("economy.prices.sell", 100);
options.put("chat.enabled", this.isPlotChat());
options.put("chat.forced", this.isForcingPlotChat());
options.put("flags.default", null);
options.put("event.spawn.egg", this.isSpawnEggs());
options.put("event.spawn.custom", this.isSpawnCustom());