diff options
| author | Aikar <[email protected]> | 2016-05-16 22:54:48 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2016-05-16 22:54:48 -0400 |
| commit | 2c6feab96378815eb082390d32d3d8e0d738175e (patch) | |
| tree | c9d69db3253e47b8cf12a97111aa42d0bcf3ff9e | |
| parent | 18b4817a33e47626a3aab9dc31650c37663fc260 (diff) | |
| download | Paper-2c6feab96378815eb082390d32d3d8e0d738175e.tar.gz Paper-2c6feab96378815eb082390d32d3d8e0d738175e.zip | |
MC-99914 - ensure EntityItem loads before EntityPotion
| -rw-r--r-- | Spigot-Server-Patches/0157-MC-99914-ensure-EntityItem-loads-before-EntityPotion.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0157-MC-99914-ensure-EntityItem-loads-before-EntityPotion.patch b/Spigot-Server-Patches/0157-MC-99914-ensure-EntityItem-loads-before-EntityPotion.patch new file mode 100644 index 0000000000..ae7d5607fe --- /dev/null +++ b/Spigot-Server-Patches/0157-MC-99914-ensure-EntityItem-loads-before-EntityPotion.patch @@ -0,0 +1,33 @@ +From e7916ce21713f358b99e80754dac20434ec5120d Mon Sep 17 00:00:00 2001 +From: Aikar <[email protected]> +Date: Mon, 16 May 2016 22:54:36 -0400 +Subject: [PATCH] MC-99914 - ensure EntityItem loads before EntityPotion + + +diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java +index 9618eaf..0b11fd7 100644 +--- a/src/main/java/net/minecraft/server/EntityItem.java ++++ b/src/main/java/net/minecraft/server/EntityItem.java +@@ -41,6 +41,7 @@ public class EntityItem extends Entity { + this.setItemStack(itemstack); + } + ++ static int uglyHack = 1; // Paper - MC-99914 - ensure EntityItem loads before EntityPotion + protected boolean playStepSound() { + return false; + } +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index 7e7ec23..8df9f38 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -136,6 +136,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs + this.dataConverterManager = dataconvertermanager; + // CraftBukkit start + this.options = options; ++ EntityItem.uglyHack++; // Paper - MC-99914 - ensure EntityItem loads before EntityPotion + // Try to see if we're actually running in a terminal, disable jline if not + if (System.console() == null && System.getProperty("jline.terminal") == null) { + System.setProperty("jline.terminal", "jline.UnsupportedTerminal"); +-- +2.8.2 + |