mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-04 10:11:29 +01:00
cac7bbc139
I misread the code and thought the code kept looping until the mob spawn cap was hit. Upon furthur review, this is not true, so this patch doesn't do anything sane.
33 lines
1.7 KiB
Diff
33 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -0,0 +0,0 @@ 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.7.4 (Apple Git-66)
|
|
|