twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-07 15:42:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.7.5

Browse Source
This commit is contained in:
Nate Mortensen
2014-03-20 22:26:30 -06:00
committed by EvilSeph
parent afb3511a4a
commit 385ace970e
206 changed files with 2670 additions and 2679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@@ -43,6 +43,7 @@ import net.minecraft.server.CommandKick;
import net.minecraft.server.CommandKill;
import net.minecraft.server.CommandList;
import net.minecraft.server.CommandMe;
import net.minecraft.server.CommandNetstat;
import net.minecraft.server.CommandOp;
import net.minecraft.server.CommandPardon;
import net.minecraft.server.CommandPardonIP;
@@ -432,6 +433,8 @@ public final class CraftServer implements Server {
commandMap.register("minecraft", new VanillaCommandWrapper(new CommandWeather(), "/weather <clear/rain/thunder> [duration in seconds]"));
commandMap.register("minecraft", new VanillaCommandWrapper(new CommandWhitelist(), "/whitelist (add|remove) <player>\n/whitelist (on|off|list|reload)"));
commandMap.register("minecraft", new VanillaCommandWrapper(new CommandXp(), "/xp <amount> [player]\n/xp <amount>L [player]"));
// This is what is in the lang file, I swear.
commandMap.register("minecraft", new VanillaCommandWrapper(new CommandNetstat(), "/list"));
}
private void loadPlugin(Plugin plugin) {
@@ -1609,11 +1612,11 @@ public final class CraftServer implements Server {
}
public void setIdleTimeout(int threshold) {
console.d(threshold); // Should be setIdleTimeout
console.setIdleTimeout(threshold);
}
public int getIdleTimeout() {
return console.aq(); // Should be getIdleTimeout
return console.getIdleTimeout();
}
@Deprecated