OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 13:07:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add fallback for when jline fails to initialize. Fixes BUKKIT-1675.

Browse source
This commit is contained in:
Travis Watkins 2012-05-22 23:44:03 -05:00
parent 21327265f0
commit 94e9543a14
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/net/minecraft/server/MinecraftServer.java
View file

@ -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

1
src/main/java/net/minecraft/server/NetServerHandler.java
View file

@ -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;
}