Update again - git isn't as smart as he looks

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-03 14:16:28 +10:00
parent bbcec2f9af
commit 70bd8275d1
4 changed files with 16 additions and 16 deletions

View File

@@ -1,4 +1,4 @@
From 91ae782ce9d2bfc7192d65c7684156322c8d8aaa Mon Sep 17 00:00:00 2001
From 4ec392f28cfe983d68545ec7180b3df783e2f396 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 16:14:30 +1000
Subject: [PATCH] Particle API
@@ -152,10 +152,10 @@ index 8508d22..9da1a47 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b81a07e..011b5fa 100644
index 8af2934..88dcced 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -266,13 +266,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -267,13 +267,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket(packet);
}
@@ -173,7 +173,7 @@ index b81a07e..011b5fa 100644
public <T> void playEffect(Location loc, Effect effect, T data) {
if (data != null) {
@@ -280,9 +278,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -281,9 +279,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} else {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@@ -191,7 +191,7 @@ index b81a07e..011b5fa 100644
}
public void sendBlockChange(Location loc, Material material, byte data) {
@@ -1007,6 +1010,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1020,6 +1023,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
return ( getHandle().playerConnection == null ) ? null : (InetSocketAddress) getHandle().playerConnection.networkManager.getSocket().getRemoteSocketAddress();
}