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

Upstream merge: conflict resolution and version bump

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-05-15 17:05:45 +10:00
parent b86bbe69d4
commit 77c0da2f07
12 changed files with 64 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0119-Fix-several-occurances-of-missed-diff.patch
View File

@@ -1,4 +1,4 @@
From fec762e0e6654930be9068e49babcc697e778651 Mon Sep 17 00:00:00 2001
From 335fcf9c78363c270df947932490c1f5bddd224b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 17:49:14 +1000
Subject: [PATCH] Fix several occurances of missed diff.
@@ -44,10 +44,10 @@ index 0f1bcc7..5eb893f 100644
public void setItemStack(ItemStack itemstack) {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2f6449e..58ae547 100644
index b1098bb..805d24f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1740,7 +1740,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1736,7 +1736,7 @@ public class PlayerConnection implements PacketPlayInListener {
}
if (itemstack.getItem() == Items.WRITTEN_BOOK && itemstack1.getItem() == Items.BOOK_AND_QUILL) {