mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MC-99914 - ensure EntityItem loads before EntityPotion

Browse source
This commit is contained in:
Aikar 2016-05-16 22:54:48 -04:00
parent 18b4817a33
commit 2c6feab963
1 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Spigot-Server-Patches/0157-MC-99914-ensure-EntityItem-loads-before-EntityPotion.patch Normal file
View file

@ -0,0 +1,33 @@
From e7916ce21713f358b99e80754dac20434ec5120d Mon Sep 17 00:00:00 2001
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
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