twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-19 14:23:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-03 18:45:50 +10:00
parent 5ed5fdbdc3
commit 19214d1353
15 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0039-Particle-API.patch
View File

@@ -1,4 +1,4 @@
From 6650757fd8a8979912ac0c9063723e3052aafd3d Mon Sep 17 00:00:00 2001
From 3e11089e5462b526055fe72958159aced12cac6f 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 e8bb8ae..a68169f 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 b956dee..ce810c0 100644
index 29fcdfb..3231226 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -270,13 +270,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -277,13 +277,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket(packet);
}
@@ -173,7 +173,7 @@ index b956dee..ce810c0 100644
public <T> void playEffect(Location loc, Effect effect, T data) {
if (data != null) {
@@ -284,9 +282,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -291,9 +289,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 b956dee..ce810c0 100644
}
public void sendBlockChange(Location loc, Material material, byte data) {
@@ -1075,6 +1078,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1082,6 +1085,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
return ( getHandle().playerConnection == null ) ? null : (InetSocketAddress) getHandle().playerConnection.networkManager.getSocket().getRemoteSocketAddress();
}