Add fallback for when jline fails to initialize. Fixes BUKKIT-1675.
Dieser Commit ist enthalten in:
Ursprung
21327265f0
Commit
94e9543a14
@ -93,8 +93,17 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
|
||||
try {
|
||||
this.reader = new ConsoleReader(System.in, System.out);
|
||||
this.reader.setExpandEvents(false); // Avoid parsing exceptions for uncommonly used event designators
|
||||
} catch (IOException ex) {
|
||||
Logger.getLogger(MinecraftServer.class.getName()).log(Level.SEVERE, null, ex);
|
||||
} catch (Exception e) {
|
||||
try {
|
||||
// Try again with jline disabled for Windows users without C++ 2008 Redistributable
|
||||
System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
|
||||
System.setProperty("user.language", "en");
|
||||
org.bukkit.craftbukkit.Main.useJline = false;
|
||||
this.reader = new ConsoleReader(System.in, System.out);
|
||||
this.reader.setExpandEvents(false);
|
||||
} catch (IOException ex) {
|
||||
Logger.getLogger(MinecraftServer.class.getName()).log(Level.SEVERE, null, ex);
|
||||
}
|
||||
}
|
||||
Runtime.getRuntime().addShutdownHook(new ServerShutdownThread(this));
|
||||
// CraftBukkit end
|
||||
|
@ -932,6 +932,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
|
||||
} else if (packet19entityaction.animation == 5) {
|
||||
this.player.setSprinting(false);
|
||||
} else if (packet19entityaction.animation == 3) {
|
||||
if (this.player.fauxSleeping && !this.player.sleeping) return; // CraftBukkit - Can't leave bed if not in one!
|
||||
this.player.a(false, true, true);
|
||||
this.checkMovement = false;
|
||||
}
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren