mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Upstream merge

Browse source
This commit is contained in:
Thinkofdeath 2014-04-18 17:08:19 +00:00
parent 4342681445
commit a118e4c40d
17 changed files with 84 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View file

@ -1,14 +1,14 @@
From 5e6467660d83b7174501637b4196fb749aead8cd Mon Sep 17 00:00:00 2001
From d27a502bbf00ddc7a8a4ddd243de26f3499acd13 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a4ede34..d9fbd00 100644
index 4590a71..a97e330 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1280,4 +1280,14 @@ public class CraftWorld implements World {
@@ -1284,4 +1284,14 @@ public class CraftWorld implements World {
cps.queueUnload(chunk.locX, chunk.locZ);
}
}
@ -64,7 +64,7 @@ index fe0f200..e026c1f 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b5a54c8..c1d3118 100644
index 55ea121..dea26e0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1285,4 +1285,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -84,5 +84,5 @@ index b5a54c8..c1d3118 100644
+ // Spigot end
}
--
1.8.3.2
1.9.1