From b3e9003c35449710803d546187802da4f632b855 Mon Sep 17 00:00:00 2001
From: cnaude <cnaude@zebra.lan>
Date: Mon, 1 Jul 2013 21:36:01 -0700
Subject: [PATCH] Add support for CraftBukkit 1.6.1.

---
 src/com/cnaude/chairs/ChairEffects.java | 2 +-
 src/com/cnaude/chairs/ChairWatcher.java | 4 ++--
 src/com/cnaude/chairs/Chairs.java       | 4 ++--
 src/plugin.yml                          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com/cnaude/chairs/ChairEffects.java b/src/com/cnaude/chairs/ChairEffects.java
index 2b940a9..e9531de 100644
--- a/src/com/cnaude/chairs/ChairEffects.java
+++ b/src/com/cnaude/chairs/ChairEffects.java
@@ -42,7 +42,7 @@ public class ChairEffects {
                             double pHealthPcnt = (double) p.getHealth() / (double) p.getMaxHealth() * 100d;
                             if ((pHealthPcnt < plugin.sitMaxHealth)
                                     && (p.getHealth() < p.getMaxHealth())) {
-                                int newHealth = plugin.sitHealthPerInterval + p.getHealth();
+                                double newHealth = plugin.sitHealthPerInterval + p.getHealth();
                                 if (newHealth > p.getMaxHealth()) {
                                     newHealth = p.getMaxHealth();
                                 }
diff --git a/src/com/cnaude/chairs/ChairWatcher.java b/src/com/cnaude/chairs/ChairWatcher.java
index 795ae3a..efcb0cb 100644
--- a/src/com/cnaude/chairs/ChairWatcher.java
+++ b/src/com/cnaude/chairs/ChairWatcher.java
@@ -5,8 +5,8 @@
 package com.cnaude.chairs;
 
 import java.util.ArrayList;
-import net.minecraft.server.v1_5_R3.DataWatcher;
-import net.minecraft.server.v1_5_R3.WatchableObject;
+import net.minecraft.server.v1_6_R1.DataWatcher;
+import net.minecraft.server.v1_6_R1.WatchableObject;
 
 /**
  *
diff --git a/src/com/cnaude/chairs/Chairs.java b/src/com/cnaude/chairs/Chairs.java
index 9e89d21..e03c09b 100644
--- a/src/com/cnaude/chairs/Chairs.java
+++ b/src/com/cnaude/chairs/Chairs.java
@@ -10,12 +10,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.minecraft.server.v1_5_R3.Packet40EntityMetadata;
+import net.minecraft.server.v1_6_R1.Packet40EntityMetadata;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.permissions.Permission;
diff --git a/src/plugin.yml b/src/plugin.yml
index a32f929..824c97c 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,5 +1,5 @@
 name: Chairs
-version: 2.1.4
+version: 2.1.5
 description: Let players sit on blocks.
 website: http://dev.bukkit.org/bukkit-plugins/chairsreloaded/
 authors: