core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix snapshot support.

This commit is contained in:
md_5 2013-03-02 17:27:44 +11:00
parent ef9bf59cb6
commit 36cebc5b7c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CraftBukkit-Patches/0041-Snapshot-support.patch
View File

@ -1,4 +1,4 @@
From 1482ff76e60f8e69e48c4a7210715a7fcb03b19c Mon Sep 17 00:00:00 2001 From 4c02879800617a5b7b0f722afeb51f16ba43166d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 2 Mar 2013 13:34:17 +1100 Date: Sat, 2 Mar 2013 13:34:17 +1100
Subject: [PATCH] Snapshot support. Subject: [PATCH] Snapshot support.
@ -14,17 +14,17 @@ Subject: [PATCH] Snapshot support.
create mode 100644 src/main/java/net/minecraft/server/Packet100OpenWindow.java create mode 100644 src/main/java/net/minecraft/server/Packet100OpenWindow.java
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 8f0a5ad..2bda8a7 100644 index 8f0a5ad..3043db9 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java --- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -39,6 +39,7 @@ public final class ItemStack { @@ -38,6 +38,7 @@ public final class ItemStack {
this.f = null;
this.id = i; this.id = i;
this.count = j; this.count = j;
this.setData(k); // CraftBukkit
+ if (org.bukkit.craftbukkit.Spigot.snapshotSupport && this.id >= 146 && this.id <= 158) this.id = 0; // Spigot + if (org.bukkit.craftbukkit.Spigot.snapshotSupport && this.id >= 146 && this.id <= 158) this.id = 0; // Spigot
this.setData(k); // CraftBukkit
} }
public static ItemStack createStack(NBTTagCompound nbttagcompound) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6005fac..79b4369 100644 index 6005fac..79b4369 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
@ -115,7 +115,7 @@ index cdd456f..08aa314 100644
for (Object object : list) { for (Object object : list) {
if (s == null) { if (s == null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 7785d45..f1dbe0c 100644 index 7785d45..b8d7652 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -23,6 +23,9 @@ public class Spigot { @@ -23,6 +23,9 @@ public class Spigot {
@ -123,7 +123,7 @@ index 7785d45..f1dbe0c 100644
public static boolean tabPing = false; public static boolean tabPing = false;
private static Metrics metrics; private static Metrics metrics;
+ public static boolean snapshotSupport; + public static boolean snapshotSupport;
+ public static int snapshotProtocolVersion = 59; + public static int snapshotProtocolVersion = 60;
+ public static String snapshotVersion = "13w09c"; + public static String snapshotVersion = "13w09c";
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {