Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

v0.82.0.5:

	- Ignore depreciated material.Door in Bukkit.
	- Update for altered Async task management in Bukkit.
	- Update minimum CraftBukkit version to #2543 (1.4.5-R1.0).
  • Loading branch information...
commit 1d2a54f2f7806ee8e25d1fa2529128252b148c60 1 parent d4f9351
@ElgarL authored
View
6 src/ChangeLog.txt
@@ -1744,4 +1744,8 @@ v0.82.0.3:
- Prevent monsters breaking frames unless explosions are enabled.
- attach PlayerMoveEvent to its related PlayerMoveChunkEvent (andre)
v0.82.0.4:
- - Fix outpost spawns to correctly use the outpost spawn permission when using no outpost number.
+ - Fix outpost spawns to correctly use the outpost spawn permission when using no outpost number.
+v0.82.0.5:
+ - Ignore depreciated material.Door in Bukkit.
+ - Update for altered Async task management in Bukkit.
+ - Update minimum CraftBukkit version to #2543 (1.4.5-R1.0).
View
2  src/com/palmergames/bukkit/blockqueue/BlockQueue.java
@@ -42,7 +42,7 @@ public static BlockQueue newInstance(Server server) {
//TODO: null = plugin
//TODO: null = plugin
//TODO: null = plugin
- server.getScheduler().scheduleAsyncDelayedTask(null, instance.getWorker());
+ server.getScheduler().runTaskLaterAsynchronously(null, instance.getWorker(),0);
return instance;
}
View
2  src/com/palmergames/bukkit/config/ConfigNodes.java
@@ -12,7 +12,7 @@
"# This is for showing the changelog on updates. Please do not edit."),
VERSION_BUKKIT(
"version.bukkit_version",
- "2459",
+ "2543",
"# Minimum required version of CraftBukkit. Please do not edit."),
VERSION_BUKKIT_BYPASS(
"version.bypass_version_check",
View
1  src/com/palmergames/bukkit/towny/tasks/ProtectionRegenTask.java
@@ -21,6 +21,7 @@
import com.palmergames.bukkit.towny.regen.TownyRegenAPI;
import com.palmergames.bukkit.towny.regen.block.BlockLocation;
+@SuppressWarnings("deprecation")
public class ProtectionRegenTask extends TownyTimerTask {
private BlockState state;
View
4 src/com/palmergames/bukkit/towny/war/eventwar/War.java
@@ -105,7 +105,7 @@ public void setupDelay(int delay) {
// new ServerBroadCastTimerTask(plugin,
// String.format("War starts in %s", TimeMgmt.formatCountdownTime(t))),
// (delay-t)*1000);
- int id = plugin.getServer().getScheduler().scheduleAsyncDelayedTask(getPlugin(), new ServerBroadCastTimerTask(plugin, String.format("War starts in %s", TimeMgmt.formatCountdownTime(t))), TimeTools.convertToTicks((delay - t)));
+ int id = BukkitTools.scheduleAsyncDelayedTask(new ServerBroadCastTimerTask(plugin, String.format("War starts in %s", TimeMgmt.formatCountdownTime(t))), TimeTools.convertToTicks((delay - t)));
if (id == -1) {
TownyMessaging.sendErrorMsg("Could not schedule a countdown message for war event.");
end();
@@ -163,7 +163,7 @@ public void start() {
}
}
//warTimer.scheduleAtFixedRate(new WarTimerTask(this), 0, 1000);
- int id = plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(getPlugin(), new WarTimerTask(plugin, this), 0, TimeTools.convertToTicks(5));
+ int id = BukkitTools.scheduleAsyncRepeatingTask(new WarTimerTask(plugin, this), 0, TimeTools.convertToTicks(5));
if (id == -1) {
TownyMessaging.sendErrorMsg("Could not schedule war event loop.");
end();
View
4 src/com/palmergames/bukkit/util/BukkitTools.java
@@ -108,7 +108,7 @@ public static int scheduleSyncDelayedTask(Runnable task, long delay) {
* @return -1 if unable to schedule or an index to the task is successful.
*/
public static int scheduleAsyncDelayedTask(Runnable task, long delay) {
- return getScheduler().scheduleAsyncDelayedTask(plugin, task, delay);
+ return getScheduler().runTaskLaterAsynchronously(plugin, task, delay).getTaskId();
}
/**
@@ -132,7 +132,7 @@ public static int scheduleSyncRepeatingTask(Runnable task, long delay, long repe
* @return -1 if unable to schedule or an index to the task is successful.
*/
public static int scheduleAsyncRepeatingTask(Runnable task, long delay, long repeat) {
- return getScheduler().scheduleAsyncRepeatingTask(plugin, task, delay, repeat);
+ return getScheduler().runTaskTimerAsynchronously(plugin, task, delay, repeat).getTaskId();
}
/**
View
2  src/plugin.yml
@@ -1,6 +1,6 @@
name: Towny
main: com.palmergames.bukkit.towny.Towny
-version: 0.82.0.4
+version: 0.82.0.5
author: Shade, Modified by FuzzeWuzze. Forked by ElgarL
website: http://code.google.com/a/eclipselabs.org/p/towny/
description: >
Please sign in to comment.
Something went wrong with that request. Please try again.