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

Update from upstream SpigotMC

Browse Source 
72d33338f08
2a70ece9ab2 [M]
abcf7aa4a40
9a88a38258c [M]
8dc4297e34f
This commit is contained in:
Zach Brown
2014-12-05 21:33:40 -06:00
parent 1d8cdd7bf5
commit c9daa16dac
28 changed files with 203 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch
View File

@@ -1,4 +1,4 @@
From 730b85ab092a7365bede2db67e038d2c8c86f748 Mon Sep 17 00:00:00 2001
From fe41f463af26484364345384b92b29aa6a18cb79 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@@ -39,10 +39,10 @@ index 5bda5d3..1bbce9b 100644
//this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index e395704..50fdfcd 100644
index d61c1de..2322a96 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1385,6 +1385,22 @@ public class CraftWorld implements World {
@@ -1390,6 +1390,22 @@ public class CraftWorld implements World {
{
CraftWorld.this.playEffect( location, effect, 0 );
}
@@ -82,5 +82,5 @@ index 243e8e5..0bacc83 100644
@Override
--
2.1.0
1.9.1