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:
md_5 2015-01-12 20:08:41 +11:00 • committed by Zach Brown
parent fb6f1e914b
commit 3de5e003f5
6 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From c3d3581a7451652d1808b50ad92de7c8e03746e9 Mon Sep 17 00:00:00 2001
From 3d085f28590dfc86aec47a6412dbf6dabfcaafc8 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
@ -25,10 +25,10 @@ index b4ad7d1..4c33f5a 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 4ff9c1a..486a828 100644
index 066c681..3f134f9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1347,4 +1347,14 @@ public class CraftWorld implements World {
@@ -1372,4 +1372,14 @@ public class CraftWorld implements World {
cps.queueUnload(chunk.locX, chunk.locZ);
}
}
@ -64,7 +64,7 @@ index dca8520..bf48e6e 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index dee0d4e..9d1e3c3 100644
index 705381f..7a9b11c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -535,4 +535,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {