TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Stupid commit, will revert"

Browse source 
This reverts commit 65ed1f42fc.
This commit is contained in:
MistPhizzle 2014-07-18 18:46:01 -04:00
parent 65ed1f42fc
commit 76b6d94c74
6 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.classpath
View file

@ -11,5 +11,6 @@
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/Towny.jar"/> <classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/Towny.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/WorldEdit.jar"/> <classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/WorldEdit.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/WorldGuard.jar"/> <classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/WorldGuard.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/Bending.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

2
src/com/projectkorra/ProjectKorra/MetricsLite.java
View file

@ -284,7 +284,7 @@ public class MetricsLite {
boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
String pluginVersion = description.getVersion(); String pluginVersion = description.getVersion();
String serverVersion = Bukkit.getVersion(); String serverVersion = Bukkit.getVersion();
int playersOnline = Bukkit.getServer().getOnlinePlayers().size(); int playersOnline = Bukkit.getServer().getOnlinePlayers().length;
// END server software specific section -- all code below does not use any code outside of this class / Java // END server software specific section -- all code below does not use any code outside of this class / Java

2
src/com/projectkorra/ProjectKorra/ProjectKorra.java
View file

@ -58,7 +58,7 @@ public class ProjectKorra extends JavaPlugin {
@Override @Override
public void onDisable() { public void onDisable() {
for (Player player: Bukkit._INVALID_getOnlinePlayers()) { for (Player player: Bukkit.getOnlinePlayers()) {
Methods.saveBendingPlayer(player.getName()); Methods.saveBendingPlayer(player.getName());
} }
Methods.stopBending(); Methods.stopBending();

5
src/com/projectkorra/ProjectKorra/RevertChecker.java
View file

@ -7,7 +7,6 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -44,9 +43,9 @@ public class RevertChecker implements Runnable {
@Override @Override
public ArrayList<Chunk> call() throws Exception { public ArrayList<Chunk> call() throws Exception {
ArrayList<Chunk> chunks = new ArrayList<Chunk>(); ArrayList<Chunk> chunks = new ArrayList<Chunk>();
Player[] players = server.getOnlinePlayers();
for (Player player : players) {
for (Player player : Bukkit._INVALID_getOnlinePlayers()) {
Chunk chunk = player.getLocation().getChunk(); Chunk chunk = player.getLocation().getChunk();
if (!chunks.contains(chunk)) if (!chunks.contains(chunk))
chunks.add(chunk); chunks.add(chunk);

16
src/com/projectkorra/ProjectKorra/chiblocking/ChiPassive.java
View file

@ -39,7 +39,7 @@ public class ChiPassive {
} }
public static void handlePassive() { public static void handlePassive() {
for (Player player: Bukkit._INVALID_getOnlinePlayers()) { for (Player player: Bukkit.getOnlinePlayers()) {
if (Methods.canBendPassive(player.getName(), Element.Chi)) { if (Methods.canBendPassive(player.getName(), Element.Chi)) {
if (player.isSprinting()) { if (player.isSprinting()) {
if (!player.hasPotionEffect(PotionEffectType.JUMP)) { if (!player.hasPotionEffect(PotionEffectType.JUMP)) {
@ -56,6 +56,20 @@ public class ChiPassive {
if (Methods.getBendingPlayer(s) == null) continue; if (Methods.getBendingPlayer(s) == null) continue;
Methods.getBendingPlayer(s).unblockChi(); Methods.getBendingPlayer(s).unblockChi();
} }
// if (BendingPlayer.blockedChi.contains(player.getName())) {
// if (BendingPlayer.blockedChi.get(player.getName()) + duration < System.currentTimeMillis()) {
// BendingPlayer.blockedChi.remove(player.getName());
// } else {
// }
// }
} }
// for (String s: BendingPlayer.blockedChi.keySet()) {
// if (BendingPlayer.blockedChi.get(s) + duration >= System.currentTimeMillis()) {
// Bukkit.getServer().broadcastMessage(s + "'s Chi is blocked.");
// } else {
// Bukkit.getServer().broadcastMessage(s + "'s Chi has been unblocked.");
// BendingPlayer.blockedChi.remove(s);
// }
// }
} }
} }

2
src/plugin.yml
View file

@ -1,6 +1,6 @@
name: ProjectKorra name: ProjectKorra
author: ProjectKorra author: ProjectKorra
version: 1.2.0 BETA 16 version: 1.2.0 BETA 15
main: com.projectkorra.ProjectKorra.ProjectKorra main: com.projectkorra.ProjectKorra.ProjectKorra
commands: commands:
projectkorra: projectkorra: