diff --git a/.gitignore b/.gitignore
index a3922e52c..17bce2dce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ update
Reference
/Plugins/Test
+/Plugins/.idea/workspace.xml
+/Plugins/out
\ No newline at end of file
diff --git a/Plugins/.idea/.name b/Plugins/.idea/.name
new file mode 100644
index 000000000..179eb2ecc
--- /dev/null
+++ b/Plugins/.idea/.name
@@ -0,0 +1 @@
+Mineplex
\ No newline at end of file
diff --git a/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_jar.xml b/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_jar.xml
new file mode 100644
index 000000000..dddcd68e4
--- /dev/null
+++ b/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_jar.xml
@@ -0,0 +1,11 @@
+
+
+ $PROJECT_DIR$/bin
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml b/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
new file mode 100644
index 000000000..3e6d81e39
--- /dev/null
+++ b/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
@@ -0,0 +1,17 @@
+
+
+ $PROJECT_DIR$/bin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/artifacts/Mineplex_ServerMonitor_jar.xml b/Plugins/.idea/artifacts/Mineplex_ServerMonitor_jar.xml
new file mode 100644
index 000000000..6dad4b8f3
--- /dev/null
+++ b/Plugins/.idea/artifacts/Mineplex_ServerMonitor_jar.xml
@@ -0,0 +1,12 @@
+
+
+ $PROJECT_DIR$/bin
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/artifacts/Nautilus_Core_Craftbukkit_jar.xml b/Plugins/.idea/artifacts/Nautilus_Core_Craftbukkit_jar.xml
new file mode 100644
index 000000000..b855273ea
--- /dev/null
+++ b/Plugins/.idea/artifacts/Nautilus_Core_Craftbukkit_jar.xml
@@ -0,0 +1,9 @@
+
+
+ $PROJECT_DIR$/bin
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
new file mode 100644
index 000000000..d90d9f83e
--- /dev/null
+++ b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
@@ -0,0 +1,16 @@
+
+
+ $PROJECT_DIR$/bin
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/codeStyleSettings.xml b/Plugins/.idea/codeStyleSettings.xml
new file mode 100644
index 000000000..d54dad62c
--- /dev/null
+++ b/Plugins/.idea/codeStyleSettings.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
diff --git a/Plugins/.idea/compiler.xml b/Plugins/.idea/compiler.xml
new file mode 100644
index 000000000..217af471a
--- /dev/null
+++ b/Plugins/.idea/compiler.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/.idea/encodings.xml b/Plugins/.idea/encodings.xml
new file mode 100644
index 000000000..ff2f8a1fe
--- /dev/null
+++ b/Plugins/.idea/encodings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/Plugins/.idea/libraries/BungeeCord.xml b/Plugins/.idea/libraries/BungeeCord.xml
new file mode 100644
index 000000000..0ac775186
--- /dev/null
+++ b/Plugins/.idea/libraries/BungeeCord.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/libraries/bukkit.xml b/Plugins/.idea/libraries/bukkit.xml
new file mode 100644
index 000000000..51e32482e
--- /dev/null
+++ b/Plugins/.idea/libraries/bukkit.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/libraries/commons_codec.xml b/Plugins/.idea/libraries/commons_codec.xml
new file mode 100644
index 000000000..0fad66459
--- /dev/null
+++ b/Plugins/.idea/libraries/commons_codec.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/libraries/commons_io.xml b/Plugins/.idea/libraries/commons_io.xml
new file mode 100644
index 000000000..fd63b1467
--- /dev/null
+++ b/Plugins/.idea/libraries/commons_io.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/libraries/craftbukkit.xml b/Plugins/.idea/libraries/craftbukkit.xml
new file mode 100644
index 000000000..4b176a94e
--- /dev/null
+++ b/Plugins/.idea/libraries/craftbukkit.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/libraries/gson.xml b/Plugins/.idea/libraries/gson.xml
new file mode 100644
index 000000000..c235da675
--- /dev/null
+++ b/Plugins/.idea/libraries/gson.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/libraries/httpclient.xml b/Plugins/.idea/libraries/httpclient.xml
new file mode 100644
index 000000000..6fd5de945
--- /dev/null
+++ b/Plugins/.idea/libraries/httpclient.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/libraries/httpcore.xml b/Plugins/.idea/libraries/httpcore.xml
new file mode 100644
index 000000000..9ea23f380
--- /dev/null
+++ b/Plugins/.idea/libraries/httpcore.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/misc.xml b/Plugins/.idea/misc.xml
new file mode 100644
index 000000000..626355d5d
--- /dev/null
+++ b/Plugins/.idea/misc.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/.idea/modules.xml b/Plugins/.idea/modules.xml
new file mode 100644
index 000000000..4ce323f7c
--- /dev/null
+++ b/Plugins/.idea/modules.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/.idea/scopes/scope_settings.xml b/Plugins/.idea/scopes/scope_settings.xml
new file mode 100644
index 000000000..922003b84
--- /dev/null
+++ b/Plugins/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/.idea/vcs.xml b/Plugins/.idea/vcs.xml
new file mode 100644
index 000000000..def6a6a18
--- /dev/null
+++ b/Plugins/.idea/vcs.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/Plugins/Mineplex.Bungee.Mineplexer/Mineplex.Bungee.Mineplexer.iml b/Plugins/Mineplex.Bungee.Mineplexer/Mineplex.Bungee.Mineplexer.iml
new file mode 100644
index 000000000..b80d37493
--- /dev/null
+++ b/Plugins/Mineplex.Bungee.Mineplexer/Mineplex.Bungee.Mineplexer.iml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml b/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml
new file mode 100644
index 000000000..be0d60967
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/Mineplex.Core/.externalToolBuilders/asdf.launch b/Plugins/Mineplex.Core/.externalToolBuilders/asdf.launch
index 0841fa6ee..88af961d4 100644
--- a/Plugins/Mineplex.Core/.externalToolBuilders/asdf.launch
+++ b/Plugins/Mineplex.Core/.externalToolBuilders/asdf.launch
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/Plugins/Mineplex.Core/Mineplex.Core.iml b/Plugins/Mineplex.Core/Mineplex.Core.iml
new file mode 100644
index 000000000..9a96ce559
--- /dev/null
+++ b/Plugins/Mineplex.Core/Mineplex.Core.iml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/Mineplex.Hub/Mineplex.Hub.iml b/Plugins/Mineplex.Hub/Mineplex.Hub.iml
new file mode 100644
index 000000000..178280767
--- /dev/null
+++ b/Plugins/Mineplex.Hub/Mineplex.Hub.iml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/Mineplex.Minecraft.BungeeSigns/Mineplex.Minecraft.BungeeSigns.iml b/Plugins/Mineplex.Minecraft.BungeeSigns/Mineplex.Minecraft.BungeeSigns.iml
new file mode 100644
index 000000000..72eea80c6
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.BungeeSigns/Mineplex.Minecraft.BungeeSigns.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml b/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml
new file mode 100644
index 000000000..0bffff66a
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml b/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml
new file mode 100644
index 000000000..569e314c3
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml b/Plugins/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml
new file mode 100644
index 000000000..f77f4212d
--- /dev/null
+++ b/Plugins/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/Nautilus.Core.CraftBukkit/Nautilus.Core.CraftBukkit.iml b/Plugins/Nautilus.Core.CraftBukkit/Nautilus.Core.CraftBukkit.iml
new file mode 100644
index 000000000..b59695f8a
--- /dev/null
+++ b/Plugins/Nautilus.Core.CraftBukkit/Nautilus.Core.CraftBukkit.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/Nautilus.Core.CraftBukkit/src/org/bukkit/craftbukkit/v1_7_R3/entity/CraftPlayer.java b/Plugins/Nautilus.Core.CraftBukkit/src/org/bukkit/craftbukkit/v1_7_R3/entity/CraftPlayer.java
index 1b98b7b0b..b76836385 100644
--- a/Plugins/Nautilus.Core.CraftBukkit/src/org/bukkit/craftbukkit/v1_7_R3/entity/CraftPlayer.java
+++ b/Plugins/Nautilus.Core.CraftBukkit/src/org/bukkit/craftbukkit/v1_7_R3/entity/CraftPlayer.java
@@ -57,6 +57,7 @@ import org.bukkit.metadata.MetadataValue;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.messaging.StandardMessenger;
import org.bukkit.scoreboard.Scoreboard;
+import org.bukkit.util.NumberConversions;
@DelegateDeserialization(CraftOfflinePlayer.class)
public class CraftPlayer extends CraftHumanEntity implements Player
@@ -67,7 +68,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player
private final ConversationTracker conversationTracker = new ConversationTracker();
private final Set channels = new HashSet();
private final Set hiddenPlayers = new HashSet();
-
+
private int hash = 0;
private double health = 20;
private boolean scaledHealth = false;
@@ -84,7 +85,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player
{
return getHandle().getProfile();
}
-
+
@Override
public boolean isOp()
{
@@ -353,7 +354,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player
break;
}
getHandle().playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect("note." + instrumentName, loc
- .getBlockX(), loc.getBlockY(), loc.getBlockZ(), 3.0f, note));
+ .getBlockX(), loc.getBlockY(), loc.getBlockZ(), 3.0f, note));
}
@Override
@@ -480,7 +481,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player
String[] astring = CraftSign.sanitizeLines(lines);
getHandle().playerConnection.sendPacket(new PacketPlayOutUpdateSign(loc.getBlockX(), loc.getBlockY(), loc
- .getBlockZ(), astring));
+ .getBlockZ(), astring));
}
@Override
@@ -1113,9 +1114,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player
}
getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(player.getPlayerListName(), true,
- getHandle().ping));
+ getHandle().ping));
}
-
+
public void removeDisconnectingPlayer(Player player)
{
hiddenPlayers.remove(player.getUniqueId());
@@ -1239,7 +1240,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player
public void abandonConversation(Conversation conversation)
{
conversationTracker.abandonConversation(conversation, new ConversationAbandonedEvent(conversation,
- new ManuallyAbandonedConversationCanceller()));
+ new ManuallyAbandonedConversationCanceller()));
}
public void abandonConversation(Conversation conversation, ConversationAbandonedEvent details)
@@ -1694,4 +1695,60 @@ public class CraftPlayer extends CraftHumanEntity implements Player
return spigot;
}
// Spigot end
+
+ @Deprecated
+ @Override
+ public int _INVALID_getLastDamage()
+ {
+ return NumberConversions.ceil(getLastDamage());
+ }
+
+ @Deprecated
+ @Override
+ public void _INVALID_setLastDamage(int damage)
+ {
+ setLastDamage(damage);
+ }
+
+ @Deprecated
+ @Override
+ public void _INVALID_damage(int amount)
+ {
+ damage(amount);
+ }
+
+ @Deprecated
+ @Override
+ public void _INVALID_damage(int amount, org.bukkit.entity.Entity source)
+ {
+ damage(amount, source);
+ }
+
+ @Deprecated
+ @Override
+ public int _INVALID_getHealth()
+ {
+ return NumberConversions.ceil(getHealth());
+ }
+
+ @Deprecated
+ @Override
+ public void _INVALID_setHealth(int health)
+ {
+ setHealth(health);
+ }
+
+ @Deprecated
+ @Override
+ public int _INVALID_getMaxHealth()
+ {
+ return NumberConversions.ceil(getMaxHealth());
+ }
+
+ @Deprecated
+ @Override
+ public void _INVALID_setMaxHealth(int health)
+ {
+ setMaxHealth(health);
+ }
}
\ No newline at end of file
diff --git a/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml b/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml
new file mode 100644
index 000000000..a1b05bc24
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+