SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
Spigot
2014-06-02 15:38:03 +01:00
parent 717840f3ee
commit 226c6d1ef0
8 changed files with 17 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
CraftBukkit-Patches/0084-Block-data-values-that-crash-the-client.patch
View File

@@ -1,4 +1,4 @@
From 2a693183d7eef1e420940b89477c31b4589e6dea Mon Sep 17 00:00:00 2001
From d2464ff0ee510c4d7eae1439b190f8438583a285 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 15 Jan 2014 21:52:47 +0000
Subject: [PATCH] Block data values that crash the client
@@ -56,45 +56,6 @@ index 874a089..088ee42 100644
TileEntity tileentity = this.e(i, j, k);
if (tileentity != null) {
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 3a18002..2ab3b9b 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -204,10 +204,7 @@ public final class ItemStack {
public void c(NBTTagCompound nbttagcompound) {
this.item = Item.d(nbttagcompound.getShort("id"));
this.count = nbttagcompound.getByte("Count");
- this.damage = nbttagcompound.getShort("Damage");
- if (this.damage < 0) {
- this.damage = 0;
- }
+ setData( nbttagcompound.getShort("Damage") ); // Spigot
if (nbttagcompound.hasKeyOfType("tag", 10)) {
// CraftBukkit - make defensive copy as this data may be coming from the save thread
@@ -258,11 +255,21 @@ public final class ItemStack {
}
// Is this a block?
- if (CraftMagicNumbers.getBlock(CraftMagicNumbers.getId(this.getItem())) != Blocks.AIR) {
+ // Spigot start - filter
+ Block block = CraftMagicNumbers.getBlock(CraftMagicNumbers.getId(this.getItem()));
+ if (block != Blocks.AIR) {
// If vanilla doesn't use data on it don't allow any
if (!(this.usesData() || this.getItem().usesDurability())) {
i = 0;
}
+ if ( block == Blocks.DOUBLE_PLANT )
+ {
+ if ( i >= 6 && i != 8 )
+ {
+ i = 0;
+ }
+ }
+ // Spigot end
}
// CraftBukkit end
--
1.9.1