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

Upstream merge

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot 2013-12-18 17:48:18 +11:00
commit 72cde1fd01
36 changed files with 109 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Bukkit-Patches/0015-Player-Collision-API.patch
View file

@ -1,14 +1,14 @@
From 64dc76e6adadefc5072c492ca1ebd81e88fa95a9 Mon Sep 17 00:00:00 2001
From 25627541c2c5d7e0ead8ddeb5ceb54f7fc2f9fd5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:20:50 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 8eab616..9ee8f5f 100644
index 9b4c28f..ba0ce2b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -741,6 +741,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -808,6 +808,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@ -37,5 +37,5 @@ index 8eab616..9ee8f5f 100644
Spigot spigot();
--
1.8.1.2
1.8.3.2