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

Upstream merge.

Browse Source
This commit is contained in:
md_5
2015-01-12 20:08:41 +11:00
committed by Zach Brown
parent fb6f1e914b
commit 3de5e003f5
6 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch
View File

@@ -1,4 +1,4 @@
From 55e5d79ca141027b6c7baa4be95f98e0388f52ee Mon Sep 17 00:00:00 2001
From a7317451acf715a588f8e7d6585a8e6a74be66ad 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 b8d30f5..bb4cb9d 100644
index 5ec836d..2c5238e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1414,6 +1414,22 @@ public class CraftWorld implements World {
@@ -1439,6 +1439,22 @@ public class CraftWorld implements World {
{
CraftWorld.this.playEffect( location, effect, 0 );
}