Update CB

This commit is contained in:
Shane Freeder
2017-08-16 16:47:06 +01:00
parent 7a4c06e567
commit 7fc4d26c3f
9 changed files with 24 additions and 26 deletions

View File

@@ -66,9 +66,10 @@ index 41330c2a2..f30613672 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper start
@Override
+ @Override
+ public void sendActionBar(String message) {
+ if (getHandle().playerConnection == null || message == null || message.isEmpty()) return;
+ getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO));
@@ -80,8 +81,7 @@ index 41330c2a2..f30613672 100644
+ sendActionBar(org.bukkit.ChatColor.translateAlternateColorCodes(alternateChar, message));
+ }
+
+ @Override
@Override
public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
packet.header = header;
--

View File

@@ -1399,10 +1399,10 @@ index ec98b3a02..63bbcf0b1 100644
@Override
public YamlConfiguration getConfig()
{
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
return org.spigotmc.SpigotConfig.config;
}
@Override
+ @Override
+ public YamlConfiguration getBukkitConfig()
+ {
+ return configuration;
@@ -1420,10 +1420,9 @@ index ec98b3a02..63bbcf0b1 100644
+ return com.destroystokyo.paper.PaperConfig.config;
+ }
+
+ @Override
@Override
public void restart() {
org.spigotmc.RestartCommand.restart();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
deleted file mode 100644
index 311a2c3f6..000000000

View File

@@ -24,18 +24,18 @@ index 7f6f7fe84..d36611644 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
<version>5.0.4</version>
<scope>compile</scope>
</dependency>
<dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>2.12.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.19.3</version>
@@ -0,0 +0,0 @@
<version>3.0.3</version>
<scope>compile</scope>