Update to 1.7.5

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-03-23 00:06:43 +00:00
parent 2bba2bc54f
commit b215942177
70 changed files with 583 additions and 586 deletions

View File

@@ -1,11 +1,11 @@
From b6888ce08f9ff41399c4672b2fe3c586f84d6d94 Mon Sep 17 00:00:00 2001
From 95af34d7340d8772be99a89e33791d100b12c8e0 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
diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
index 36923bb..ae8753f 100644
index 2fd88c0..35806d1 100644
--- a/src/main/java/net/minecraft/server/EntityLightning.java
+++ b/src/main/java/net/minecraft/server/EntityLightning.java
@@ -13,6 +13,8 @@ public class EntityLightning extends EntityWeather {
@@ -17,7 +17,7 @@ index 36923bb..ae8753f 100644
public EntityLightning(World world, double d0, double d1, double d2) {
this(world, d0, d1, d2, false);
}
@@ -61,9 +63,17 @@ public class EntityLightning extends EntityWeather {
@@ -60,9 +62,17 @@ public class EntityLightning extends EntityWeather {
}
}
@@ -37,7 +37,7 @@ index 36923bb..ae8753f 100644
this.world.makeSound(this.locX, this.locY, this.locZ, "random.explode", 2.0F, 0.5F + 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 948e81d..ab87519 100644
index 363d8e2..466c687 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1326,6 +1326,22 @@ public class CraftWorld implements World {
@@ -101,5 +101,5 @@ index 64e346d..be4f10f 100644
+ // Spigot end
}
--
1.8.3.2
1.8.5.2.msysgit.0