mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
b170e8cedb
Remove two features added upstream
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
From e035cc22efde49cb0ce7a107bc992be863a6bd42 Mon Sep 17 00:00:00 2001
|
|
From: Fabse <fabse@uwmc.info>
|
|
Date: Mon, 28 Mar 2016 00:46:46 +0200
|
|
Subject: [PATCH] Minecart drop name workaround
|
|
|
|
This is a workaround for MC-68446 (or similar).
|
|
In Survival Minecraft this bug only shows in minecart drops, so this is the only thing fixed here.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
|
index 4438d83..9df7dfc 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
|
@@ -172,7 +172,7 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
|
|
if (this.world.getGameRules().getBoolean("doEntityDrops")) {
|
|
ItemStack itemstack = new ItemStack(Items.MINECART, 1);
|
|
|
|
- if (this.getName() != null) {
|
|
+ if (this.hasCustomName()) { // Paper - Only set item name if custom name is set. Workaround for MC-68446
|
|
itemstack.c(this.getName());
|
|
}
|
|
|
|
--
|
|
2.9.2.windows.1
|
|
|