From 596047aa6b18c1c18a6b7280f21ddb01e8913479 Mon Sep 17 00:00:00 2001
From: Travis Watkins <amaranth@ubuntu.com>
Date: Mon, 18 Mar 2013 13:58:16 -0500
Subject: [PATCH] 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.
---
 src/main/java/net/minecraft/server/EntityPlayer.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index f3edc6a0ec..03140c2723 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));
     }