Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2025-01-21 21:31:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
GeorgH93 2020-08-06 17:59:48 +02:00
commit e5b1c86f63
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Backpack.java
View File

@ -281,5 +281,7 @@ public void clear()
public void drop(final @NotNull Location location)
{
InventoryUtils.dropInventory(bp, location);
setChanged();
save();
}
}

3
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/DebugCommand.java
View File

@ -87,7 +87,7 @@ public void execute(@NotNull CommandSender commandSender, @NotNull String mainCo
writer.append(plugin.getDescription().getName()).append(" Version: ").append(plugin.getDescription().getVersion());
writer.append("\nServer: ").append(Bukkit.getServer().getBukkitVersion()).append(" (").append(Bukkit.getServer().getVersion()).append(")");
writer.append("\nJava: ").append(System.getProperty("java.version"));
writer.append("\\n\\nPlugins:\n");
writer.append("\n\nPlugins:\n");
for(Plugin p : Bukkit.getServer().getPluginManager().getPlugins())
{
writer.append(p.getName()).append(' ').append(p.getDescription().getVersion()).append('\n');
@ -99,6 +99,7 @@ public void execute(@NotNull CommandSender commandSender, @NotNull String mainCo
while((line = configReader.readLine()) != null)
{
if(line.isEmpty()) continue;
if(line.contains("Host") || line.contains("Password") || line.contains("User")) line = line.replaceAll("^(\\s+\\w+):.*$", "$1: ********");
writer.append(line).append('\n');
}
}

2
pom.xml
View File

@ -7,7 +7,7 @@
<packaging>pom</packaging>
<properties>
<revision>2.4-ALPHA-SNAPSHOT</revision>
<revision>3.0-ALPHA-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>