Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix conflicts.

Browse Source
This commit is contained in:
md_5
2015-07-10 22:33:16 +10:00
committed by Byteflux
parent a5bb700ee9
commit 5683ee8585
27 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0036-Player-Collision-API.patch
View File

@@ -1,4 +1,4 @@
From 75fe922e23f20ed1faef60d344900a1864967a65 Mon Sep 17 00:00:00 2001
From 4e7f9d600c61430373fbe1961fccef936c9575e4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API
@@ -64,10 +64,10 @@ index e707dd7..b0681cf 100644
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
super(worldserver, gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ae25252..5236f8f 100644
index a37085c..7e75708 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1331,6 +1331,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1351,6 +1351,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{