2016-06-23 02:43:02 +00:00
|
|
|
From 3490ddd51256ba1788e4f8b0b7afee1f04f19498 Mon Sep 17 00:00:00 2001
|
2016-05-17 02:54:48 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
|
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
|
2016-06-09 03:57:14 +00:00
|
|
|
index 234c547..691a78b 100644
|
2016-05-17 02:54:48 +00:00
|
|
|
--- 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
|
2016-06-11 19:58:54 +00:00
|
|
|
index e52b433..19757c5 100644
|
2016-05-17 02:54:48 +00:00
|
|
|
--- 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");
|
|
|
|
|
--
|
2016-06-23 02:18:41 +00:00
|
|
|
2.9.0
|
2016-05-17 02:54:48 +00:00
|
|
|
|
