summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2013-03-18 13:58:16 -0500
committerTravis Watkins <amaranth@ubuntu.com>2013-03-18 13:58:16 -0500
commit596047aa6b18c1c18a6b7280f21ddb01e8913479 (patch)
tree6e280f789d4bff6e61299d93fad61b81707aae5b /src
parent1bde25bb3328186c2d13b8e566b84ada543f1b1a (diff)
downloadcraftbukkit-596047aa6b18c1c18a6b7280f21ddb01e8913479.tar
craftbukkit-596047aa6b18c1c18a6b7280f21ddb01e8913479.tar.gz
craftbukkit-596047aa6b18c1c18a6b7280f21ddb01e8913479.tar.lz
craftbukkit-596047aa6b18c1c18a6b7280f21ddb01e8913479.tar.xz
craftbukkit-596047aa6b18c1c18a6b7280f21ddb01e8913479.zip
Only set player weather if a plugin requested it.
If the server changes the weather it will set the per-player weather variable and future changes will not apply. We should only set this variable when a plugin is requesting per-player weather and not when the server it doing it.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/EntityPlayer.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index f3edc6a0..03140c27 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -841,7 +841,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
return;
}
- this.weather = type;
+ if (plugin) {
+ this.weather = type;
+ }
+
this.playerConnection.sendPacket(new Packet70Bed(type == WeatherType.DOWNFALL ? 1 : 2, 0));
}