From a59cfc63793d50ac744bf275334163f637f827dd Mon Sep 17 00:00:00 2001 From: TomyLobo Date: Sun, 16 Jun 2013 10:17:48 +1000 Subject: [PATCH] Fix compilation on Sun JDK (and any other strictly conforming compiler) http://docs.oracle.com/javase/specs/jls/se7/html/jls-15.html#jls-15.12.1 http://ideone.com/MGCWja --- CraftBukkit-Patches/0050-Particle-API.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CraftBukkit-Patches/0050-Particle-API.patch b/CraftBukkit-Patches/0050-Particle-API.patch index 53954f6a1f..03da54be01 100644 --- a/CraftBukkit-Patches/0050-Particle-API.patch +++ b/CraftBukkit-Patches/0050-Particle-API.patch @@ -1,4 +1,4 @@ -From fa2fcf2e45e5fcf0b68f3cac7ef0d48a18d26b80 Mon Sep 17 00:00:00 2001 +From 895cefe23647dfcda3b133779b8cb73a68e20abc Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 16:14:30 +1000 Subject: [PATCH] Particle API @@ -43,7 +43,7 @@ index 7de0de5..7eca388 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4439ebc..e762c9b 100644 +index 4439ebc..536a4d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -885,31 +885,21 @@ public class CraftWorld implements World { @@ -146,7 +146,7 @@ index 4439ebc..e762c9b 100644 + @Override + public void playEffect(Location location, Effect effect) + { -+ playEffect( location, effect, 0 ); ++ CraftWorld.this.playEffect( location, effect, 0 ); + } };