From 0c36d138b957dfddfb40cd2cc23c67a9b4630039 Mon Sep 17 00:00:00 2001 From: cnaude Date: Sun, 23 Jun 2013 13:16:47 -0700 Subject: [PATCH] Code refactoring. Add website to plugin.yml --- src/{net/spoothie => com/cnaude}/chairs/ChairBlock.java | 2 +- src/{net/spoothie => com/cnaude}/chairs/ChairEffects.java | 2 +- src/{net/spoothie => com/cnaude}/chairs/ChairWatcher.java | 2 +- src/{net/spoothie => com/cnaude}/chairs/Chairs.java | 2 +- src/{net/spoothie => com/cnaude}/chairs/ChairsCommand.java | 2 +- .../spoothie => com/cnaude}/chairs/ChairsIgnoreList.java | 2 +- src/{net/spoothie => com/cnaude}/chairs/EventListener.java | 7 ++++++- src/plugin.yml | 5 +++-- 8 files changed, 15 insertions(+), 9 deletions(-) rename src/{net/spoothie => com/cnaude}/chairs/ChairBlock.java (89%) rename src/{net/spoothie => com/cnaude}/chairs/ChairEffects.java (95%) rename src/{net/spoothie => com/cnaude}/chairs/ChairWatcher.java (92%) rename src/{net/spoothie => com/cnaude}/chairs/Chairs.java (99%) rename src/{net/spoothie => com/cnaude}/chairs/ChairsCommand.java (95%) rename src/{net/spoothie => com/cnaude}/chairs/ChairsIgnoreList.java (95%) rename src/{net/spoothie => com/cnaude}/chairs/EventListener.java (99%) diff --git a/src/net/spoothie/chairs/ChairBlock.java b/src/com/cnaude/chairs/ChairBlock.java similarity index 89% rename from src/net/spoothie/chairs/ChairBlock.java rename to src/com/cnaude/chairs/ChairBlock.java index fdf38c9..4febecf 100644 --- a/src/net/spoothie/chairs/ChairBlock.java +++ b/src/com/cnaude/chairs/ChairBlock.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package net.spoothie.chairs; +package com.cnaude.chairs; import org.bukkit.Material; diff --git a/src/net/spoothie/chairs/ChairEffects.java b/src/com/cnaude/chairs/ChairEffects.java similarity index 95% rename from src/net/spoothie/chairs/ChairEffects.java rename to src/com/cnaude/chairs/ChairEffects.java index dec7410..2b940a9 100644 --- a/src/net/spoothie/chairs/ChairEffects.java +++ b/src/com/cnaude/chairs/ChairEffects.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package net.spoothie.chairs; +package com.cnaude.chairs; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/net/spoothie/chairs/ChairWatcher.java b/src/com/cnaude/chairs/ChairWatcher.java similarity index 92% rename from src/net/spoothie/chairs/ChairWatcher.java rename to src/com/cnaude/chairs/ChairWatcher.java index 7e8a1de..795ae3a 100644 --- a/src/net/spoothie/chairs/ChairWatcher.java +++ b/src/com/cnaude/chairs/ChairWatcher.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package net.spoothie.chairs; +package com.cnaude.chairs; import java.util.ArrayList; import net.minecraft.server.v1_5_R3.DataWatcher; diff --git a/src/net/spoothie/chairs/Chairs.java b/src/com/cnaude/chairs/Chairs.java similarity index 99% rename from src/net/spoothie/chairs/Chairs.java rename to src/com/cnaude/chairs/Chairs.java index cef863e..e02524a 100644 --- a/src/net/spoothie/chairs/Chairs.java +++ b/src/com/cnaude/chairs/Chairs.java @@ -1,4 +1,4 @@ -package net.spoothie.chairs; +package com.cnaude.chairs; import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolManager; diff --git a/src/net/spoothie/chairs/ChairsCommand.java b/src/com/cnaude/chairs/ChairsCommand.java similarity index 95% rename from src/net/spoothie/chairs/ChairsCommand.java rename to src/com/cnaude/chairs/ChairsCommand.java index 0f41e1f..b851f44 100644 --- a/src/net/spoothie/chairs/ChairsCommand.java +++ b/src/com/cnaude/chairs/ChairsCommand.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package net.spoothie.chairs; +package com.cnaude.chairs; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/net/spoothie/chairs/ChairsIgnoreList.java b/src/com/cnaude/chairs/ChairsIgnoreList.java similarity index 95% rename from src/net/spoothie/chairs/ChairsIgnoreList.java rename to src/com/cnaude/chairs/ChairsIgnoreList.java index 71c6e8d..6b473c6 100644 --- a/src/net/spoothie/chairs/ChairsIgnoreList.java +++ b/src/com/cnaude/chairs/ChairsIgnoreList.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package net.spoothie.chairs; +package com.cnaude.chairs; import java.io.*; import java.util.ArrayList; diff --git a/src/net/spoothie/chairs/EventListener.java b/src/com/cnaude/chairs/EventListener.java similarity index 99% rename from src/net/spoothie/chairs/EventListener.java rename to src/com/cnaude/chairs/EventListener.java index f0aab80..931e715 100644 --- a/src/net/spoothie/chairs/EventListener.java +++ b/src/com/cnaude/chairs/EventListener.java @@ -1,4 +1,4 @@ -package net.spoothie.chairs; +package com.cnaude.chairs; import java.util.ArrayList; import org.bukkit.Bukkit; @@ -58,6 +58,11 @@ public class EventListener implements Listener { delayedSitTask(); } + @EventHandler + public void onPlayerTeleport(PlayerTeleportEvent event) { + delayedSitTask(); + } + private void delayedSitTask() { plugin.getServer().getScheduler().runTaskLater(plugin, new Runnable() { @Override diff --git a/src/plugin.yml b/src/plugin.yml index 19d4d9c..2195a76 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,10 +1,11 @@ name: Chairs -version: 2.1.0 +version: 2.1.2 description: Let players sit on blocks. +website: http://dev.bukkit.org/bukkit-plugins/chairsreloaded/ authors: - spoothie - cnaude -main: net.spoothie.chairs.Chairs +main: com.cnaude.chairs.Chairs softdepend: - ProtocolLib commands: