Fix conflicts.

2015-07-10 22:33:16 +10:00
parent 950d51d5e3
commit 84c55fb710
3 changed files with 5 additions and 5 deletions
--- a/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch
+++ b/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch
@@ -99,7 +99,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.md_5.bungee.api.chat.BaseComponent;
 
 import net.minecraft.server.*;
- 
+ import net.minecraft.server.PacketPlayOutTitle.EnumTitleAction;
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
             return java.util.Collections.unmodifiableSet( ret );