diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar
index dae9c94a0..f2f6de608 100644
Binary files a/Plugins/Libraries/craftbukkit.jar and b/Plugins/Libraries/craftbukkit.jar differ
diff --git a/Plugins/Mineplex.Core/.classpath b/Plugins/Mineplex.Core/.classpath
index 1b25576a2..a5190f09e 100644
--- a/Plugins/Mineplex.Core/.classpath
+++ b/Plugins/Mineplex.Core/.classpath
@@ -2,11 +2,11 @@
-
+
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
index f6321f6a3..6da334b35 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
@@ -6,7 +6,7 @@ import java.util.HashSet;
import mineplex.core.account.event.AsyncClientLoadEvent;
import mineplex.core.account.event.ClientUnloadEvent;
import mineplex.core.account.event.ClientWebResponseEvent;
-import mineplex.core.account.event.RetrieveClientInformationEvent;
+//import mineplex.core.account.event.RetrieveClientInformationEvent;
import mineplex.core.account.repository.AccountRepository;
import mineplex.core.account.repository.token.ClientToken;
import mineplex.core.common.Rank;
@@ -151,7 +151,7 @@ public class CoreClientManager implements Listener
try
{
- Bukkit.getServer().getPluginManager().callEvent(new RetrieveClientInformationEvent(connection));
+ //Bukkit.getServer().getPluginManager().callEvent(new RetrieveClientInformationEvent(connection));
}
catch (Exception exception)
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
index 50143b02a..bd7878f76 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
@@ -5,10 +5,10 @@ import mineplex.core.recharge.Recharge;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.updater.UpdateType;
import mineplex.core.account.CoreClientManager;
-import mineplex.core.account.event.RetrieveClientInformationEvent;
+//import mineplex.core.account.event.RetrieveClientInformationEvent;
import mineplex.core.chat.command.BroadcastCommand;
import mineplex.core.chat.command.SilenceCommand;
-import mineplex.core.chat.repository.ChatRepository;
+//import mineplex.core.chat.repository.ChatRepository;
import mineplex.core.common.Rank;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
@@ -25,7 +25,7 @@ import org.bukkit.plugin.java.JavaPlugin;
public class Chat extends MiniClientPlugin
{
private CoreClientManager _clientManager;
- private ChatRepository _repository;
+ //private ChatRepository _repository;
private long _silenced = 0;
@@ -44,12 +44,13 @@ public class Chat extends MiniClientPlugin
AddCommand(new BroadcastCommand(this));
}
+ /*
@EventHandler
public void retrieveClientInformation(RetrieveClientInformationEvent event)
{
_repository.loadClientInformation(event.getConnection());
}
-
+ */
public void Silence(long duration, boolean inform)
{
//Set Silenced
diff --git a/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/EntityGhast.java b/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/EntityGhast.java
index 92197cf7c..645bb830e 100644
--- a/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/EntityGhast.java
+++ b/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/EntityGhast.java
@@ -8,240 +8,251 @@ import org.bukkit.event.entity.EntityTargetEvent;
public class EntityGhast extends EntityFlying implements IMonster {
- public int h;
- public double i;
- public double j;
- public double bn;
- private Entity target;
- private int br;
- public int bo;
- public int bp;
- private int explosionPower = 1;
+ public int h;
+ public double i;
+ public double j;
+ public double bn;
+ private Entity target;
+ private int br;
+ public int bo;
+ public int bp;
+ private int explosionPower = 1;
- public EntityGhast(World world) {
- super(world);
- this.a(4.0F, 4.0F);
- this.fireProof = true;
- this.b = 5;
- }
+ public EntityGhast(World world) {
+ super(world);
+ this.a(4.0F, 4.0F);
+ this.fireProof = true;
+ this.b = 5;
+ }
- public boolean damageEntity(DamageSource damagesource, float f) {
- if (this.isInvulnerable()) {
- return false;
- } else if ("fireball".equals(damagesource.n()) && damagesource.getEntity() instanceof EntityHuman) {
- super.damageEntity(damagesource, 1000.0F);
- ((EntityHuman) damagesource.getEntity()).a((Statistic) AchievementList.y);
- return true;
- } else {
- return super.damageEntity(damagesource, f);
- }
- }
+ public boolean damageEntity(DamageSource damagesource, float f) {
+ if (this.isInvulnerable()) {
+ return false;
+ } else if ("fireball".equals(damagesource.n()) && damagesource.getEntity() instanceof EntityHuman) {
+ super.damageEntity(damagesource, 1000.0F);
+ ((EntityHuman) damagesource.getEntity()).a((Statistic) AchievementList.y);
+ return true;
+ } else {
+ return super.damageEntity(damagesource, f);
+ }
+ }
- protected void a() {
- super.a();
- this.datawatcher.a(16, Byte.valueOf((byte) 0));
- }
+ protected void a() {
+ super.a();
+ this.datawatcher.a(16, Byte.valueOf((byte) 0));
+ }
- protected void az() {
- super.az();
- this.getAttributeInstance(GenericAttributes.a).setValue(10.0D);
- }
+ protected void az() {
+ super.az();
+ this.getAttributeInstance(GenericAttributes.a).setValue(10.0D);
+ }
- protected void bl() {
- if (!this.world.isStatic && this.world.difficulty == 0) {
- this.die();
- }
-
- if (Vegetated)
- return;
+ protected void bl() {
+ if (!this.world.isStatic && this.world.difficulty == 0) {
+ this.die();
+ }
- this.u();
- this.bo = this.bp;
- double d0 = this.i - this.locX;
- double d1 = this.j - this.locY;
- double d2 = this.bn - this.locZ;
- double d3 = d0 * d0 + d1 * d1 + d2 * d2;
+ if (Vegetated)
+ {
+ double d0 = this.i - this.locX;
+ double d1 = this.j - this.locY;
+ double d2 = this.bn - this.locZ;
+ double d3 = d0 * d0 + d1 * d1 + d2 * d2;
- if (d3 < 1.0D || d3 > 3600.0D) {
- this.i = this.locX + (double) ((this.random.nextFloat() * 2.0F - 1.0F) * 16.0F);
- this.j = this.locY + (double) ((this.random.nextFloat() * 2.0F - 1.0F) * 16.0F);
- this.bn = this.locZ + (double) ((this.random.nextFloat() * 2.0F - 1.0F) * 16.0F);
- }
+ this.motX += d0 / d3 * 0.1D;
+ this.motY += d1 / d3 * 0.1D;
+ this.motZ += d2 / d3 * 0.1D;
- if (this.h-- <= 0) {
- this.h += this.random.nextInt(5) + 2;
- d3 = (double) MathHelper.sqrt(d3);
- if (this.a(this.i, this.j, this.bn, d3)) {
- this.motX += d0 / d3 * 0.1D;
- this.motY += d1 / d3 * 0.1D;
- this.motZ += d2 / d3 * 0.1D;
- } else {
- this.i = this.locX;
- this.j = this.locY;
- this.bn = this.locZ;
- }
- }
+ return;
+ }
- if (this.target != null && this.target.dead) {
- // CraftBukkit start
- EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), null, EntityTargetEvent.TargetReason.TARGET_DIED);
- this.world.getServer().getPluginManager().callEvent(event);
+ this.u();
+ this.bo = this.bp;
+ double d0 = this.i - this.locX;
+ double d1 = this.j - this.locY;
+ double d2 = this.bn - this.locZ;
+ double d3 = d0 * d0 + d1 * d1 + d2 * d2;
- if (!event.isCancelled()) {
- if (event.getTarget() == null) {
- this.target = null;
- } else {
- this.target = ((CraftEntity) event.getTarget()).getHandle();
- }
- }
- // CraftBukkit end
- }
+ if (d3 < 1.0D || d3 > 3600.0D) {
+ this.i = this.locX + (double) ((this.random.nextFloat() * 2.0F - 1.0F) * 16.0F);
+ this.j = this.locY + (double) ((this.random.nextFloat() * 2.0F - 1.0F) * 16.0F);
+ this.bn = this.locZ + (double) ((this.random.nextFloat() * 2.0F - 1.0F) * 16.0F);
+ }
- if (this.target == null || this.br-- <= 0) {
- // CraftBukkit start
- Entity target = this.world.findNearbyVulnerablePlayer(this, 100.0D);
- if (target != null) {
- EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), target.getBukkitEntity(), EntityTargetEvent.TargetReason.CLOSEST_PLAYER);
- this.world.getServer().getPluginManager().callEvent(event);
+ if (this.h-- <= 0) {
+ this.h += this.random.nextInt(5) + 2;
+ d3 = (double) MathHelper.sqrt(d3);
+ if (this.a(this.i, this.j, this.bn, d3)) {
+ this.motX += d0 / d3 * 0.1D;
+ this.motY += d1 / d3 * 0.1D;
+ this.motZ += d2 / d3 * 0.1D;
+ } else {
+ this.i = this.locX;
+ this.j = this.locY;
+ this.bn = this.locZ;
+ }
+ }
- if (!event.isCancelled()) {
- if (event.getTarget() == null) {
- this.target = null;
- } else {
- this.target = ((CraftEntity) event.getTarget()).getHandle();
- }
- }
- }
- // CraftBukkit end
+ if (this.target != null && this.target.dead) {
+ // CraftBukkit start
+ EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), null, EntityTargetEvent.TargetReason.TARGET_DIED);
+ this.world.getServer().getPluginManager().callEvent(event);
- if (this.target != null) {
- this.br = 20;
- }
- }
+ if (!event.isCancelled()) {
+ if (event.getTarget() == null) {
+ this.target = null;
+ } else {
+ this.target = ((CraftEntity) event.getTarget()).getHandle();
+ }
+ }
+ // CraftBukkit end
+ }
- double d4 = 64.0D;
+ if (this.target == null || this.br-- <= 0) {
+ // CraftBukkit start
+ Entity target = this.world.findNearbyVulnerablePlayer(this, 100.0D);
+ if (target != null) {
+ EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), target.getBukkitEntity(), EntityTargetEvent.TargetReason.CLOSEST_PLAYER);
+ this.world.getServer().getPluginManager().callEvent(event);
- if (this.target != null && this.target.e((Entity) this) < d4 * d4) {
- double d5 = this.target.locX - this.locX;
- double d6 = this.target.boundingBox.b + (double) (this.target.length / 2.0F) - (this.locY + (double) (this.length / 2.0F));
- double d7 = this.target.locZ - this.locZ;
+ if (!event.isCancelled()) {
+ if (event.getTarget() == null) {
+ this.target = null;
+ } else {
+ this.target = ((CraftEntity) event.getTarget()).getHandle();
+ }
+ }
+ }
+ // CraftBukkit end
- this.aN = this.yaw = -((float) Math.atan2(d5, d7)) * 180.0F / 3.1415927F;
- if (this.o(this.target)) {
- if (this.bp == 10) {
- this.world.a((EntityHuman) null, 1007, (int) this.locX, (int) this.locY, (int) this.locZ, 0);
- }
+ if (this.target != null) {
+ this.br = 20;
+ }
+ }
- ++this.bp;
- if (this.bp == 20) {
- this.world.a((EntityHuman) null, 1008, (int) this.locX, (int) this.locY, (int) this.locZ, 0);
- EntityLargeFireball entitylargefireball = new EntityLargeFireball(this.world, this, d5, d6, d7);
+ double d4 = 64.0D;
- // CraftBukkit - set bukkitYield when setting explosionpower
- entitylargefireball.bukkitYield = entitylargefireball.yield = this.explosionPower;
- double d8 = 4.0D;
- Vec3D vec3d = this.j(1.0F);
+ if (this.target != null && this.target.e((Entity) this) < d4 * d4) {
+ double d5 = this.target.locX - this.locX;
+ double d6 = this.target.boundingBox.b + (double) (this.target.length / 2.0F) - (this.locY + (double) (this.length / 2.0F));
+ double d7 = this.target.locZ - this.locZ;
- entitylargefireball.locX = this.locX + vec3d.c * d8;
- entitylargefireball.locY = this.locY + (double) (this.length / 2.0F) + 0.5D;
- entitylargefireball.locZ = this.locZ + vec3d.e * d8;
- this.world.addEntity(entitylargefireball);
- this.bp = -40;
- }
- } else if (this.bp > 0) {
- --this.bp;
- }
- } else {
- this.aN = this.yaw = -((float) Math.atan2(this.motX, this.motZ)) * 180.0F / 3.1415927F;
- if (this.bp > 0) {
- --this.bp;
- }
- }
+ this.aN = this.yaw = -((float) Math.atan2(d5, d7)) * 180.0F / 3.1415927F;
+ if (this.o(this.target)) {
+ if (this.bp == 10) {
+ this.world.a((EntityHuman) null, 1007, (int) this.locX, (int) this.locY, (int) this.locZ, 0);
+ }
- if (!this.world.isStatic) {
- byte b0 = this.datawatcher.getByte(16);
- byte b1 = (byte) (this.bp > 10 ? 1 : 0);
+ ++this.bp;
+ if (this.bp == 20) {
+ this.world.a((EntityHuman) null, 1008, (int) this.locX, (int) this.locY, (int) this.locZ, 0);
+ EntityLargeFireball entitylargefireball = new EntityLargeFireball(this.world, this, d5, d6, d7);
- if (b0 != b1) {
- this.datawatcher.watch(16, Byte.valueOf(b1));
- }
- }
- }
+ // CraftBukkit - set bukkitYield when setting explosionpower
+ entitylargefireball.bukkitYield = entitylargefireball.yield = this.explosionPower;
+ double d8 = 4.0D;
+ Vec3D vec3d = this.j(1.0F);
- private boolean a(double d0, double d1, double d2, double d3) {
- double d4 = (this.i - this.locX) / d3;
- double d5 = (this.j - this.locY) / d3;
- double d6 = (this.bn - this.locZ) / d3;
- AxisAlignedBB axisalignedbb = this.boundingBox.clone();
+ entitylargefireball.locX = this.locX + vec3d.c * d8;
+ entitylargefireball.locY = this.locY + (double) (this.length / 2.0F) + 0.5D;
+ entitylargefireball.locZ = this.locZ + vec3d.e * d8;
+ this.world.addEntity(entitylargefireball);
+ this.bp = -40;
+ }
+ } else if (this.bp > 0) {
+ --this.bp;
+ }
+ } else {
+ this.aN = this.yaw = -((float) Math.atan2(this.motX, this.motZ)) * 180.0F / 3.1415927F;
+ if (this.bp > 0) {
+ --this.bp;
+ }
+ }
- for (int i = 1; (double) i < d3; ++i) {
- axisalignedbb.d(d4, d5, d6);
- if (!this.world.getCubes(this, axisalignedbb).isEmpty()) {
- return false;
- }
- }
+ if (!this.world.isStatic) {
+ byte b0 = this.datawatcher.getByte(16);
+ byte b1 = (byte) (this.bp > 10 ? 1 : 0);
- return true;
- }
+ if (b0 != b1) {
+ this.datawatcher.watch(16, Byte.valueOf(b1));
+ }
+ }
+ }
- protected String r() {
- return "mob.ghast.moan";
- }
+ private boolean a(double d0, double d1, double d2, double d3) {
+ double d4 = (this.i - this.locX) / d3;
+ double d5 = (this.j - this.locY) / d3;
+ double d6 = (this.bn - this.locZ) / d3;
+ AxisAlignedBB axisalignedbb = this.boundingBox.clone();
- protected String aO() {
- return "mob.ghast.scream";
- }
+ for (int i = 1; (double) i < d3; ++i) {
+ axisalignedbb.d(d4, d5, d6);
+ if (!this.world.getCubes(this, axisalignedbb).isEmpty()) {
+ return false;
+ }
+ }
- protected String aP() {
- return "mob.ghast.death";
- }
+ return true;
+ }
- protected int getLootId() {
- return Item.SULPHUR.id;
- }
+ protected String r() {
+ return "mob.ghast.moan";
+ }
- protected void dropDeathLoot(boolean flag, int i) {
- // CraftBukkit start
- java.util.List loot = new java.util.ArrayList();
- int j = this.random.nextInt(2) + this.random.nextInt(1 + i);
+ protected String aO() {
+ return "mob.ghast.scream";
+ }
- int k;
+ protected String aP() {
+ return "mob.ghast.death";
+ }
- if (j > 0) {
- loot.add(CraftItemStack.asNewCraftStack(Item.GHAST_TEAR, j));
- }
+ protected int getLootId() {
+ return Item.SULPHUR.id;
+ }
- j = this.random.nextInt(3) + this.random.nextInt(1 + i);
+ protected void dropDeathLoot(boolean flag, int i) {
+ // CraftBukkit start
+ java.util.List loot = new java.util.ArrayList();
+ int j = this.random.nextInt(2) + this.random.nextInt(1 + i);
- if (j > 0) {
- loot.add(CraftItemStack.asNewCraftStack(Item.SULPHUR, j));
- }
+ int k;
- org.bukkit.craftbukkit.v1_6_R3.event.CraftEventFactory.callEntityDeathEvent(this, loot);
- // CraftBukkit end
- }
+ if (j > 0) {
+ loot.add(CraftItemStack.asNewCraftStack(Item.GHAST_TEAR, j));
+ }
- protected float ba() {
- return 10.0F;
- }
+ j = this.random.nextInt(3) + this.random.nextInt(1 + i);
- public boolean canSpawn() {
- return this.random.nextInt(20) == 0 && super.canSpawn() && this.world.difficulty > 0;
- }
+ if (j > 0) {
+ loot.add(CraftItemStack.asNewCraftStack(Item.SULPHUR, j));
+ }
- public int bv() {
- return 1;
- }
+ org.bukkit.craftbukkit.v1_6_R3.event.CraftEventFactory.callEntityDeathEvent(this, loot);
+ // CraftBukkit end
+ }
- public void b(NBTTagCompound nbttagcompound) {
- super.b(nbttagcompound);
- nbttagcompound.setInt("ExplosionPower", this.explosionPower);
- }
+ protected float ba() {
+ return 10.0F;
+ }
- public void a(NBTTagCompound nbttagcompound) {
- super.a(nbttagcompound);
- if (nbttagcompound.hasKey("ExplosionPower")) {
- this.explosionPower = nbttagcompound.getInt("ExplosionPower");
- }
- }
+ public boolean canSpawn() {
+ return this.random.nextInt(20) == 0 && super.canSpawn() && this.world.difficulty > 0;
+ }
+
+ public int bv() {
+ return 1;
+ }
+
+ public void b(NBTTagCompound nbttagcompound) {
+ super.b(nbttagcompound);
+ nbttagcompound.setInt("ExplosionPower", this.explosionPower);
+ }
+
+ public void a(NBTTagCompound nbttagcompound) {
+ super.a(nbttagcompound);
+ if (nbttagcompound.hasKey("ExplosionPower")) {
+ this.explosionPower = nbttagcompound.getInt("ExplosionPower");
+ }
+ }
}
\ No newline at end of file
diff --git a/Plugins/Nautilus.Game.Arcade/.classpath b/Plugins/Nautilus.Game.Arcade/.classpath
index 3d5304c8c..51a03d2ae 100644
--- a/Plugins/Nautilus.Game.Arcade/.classpath
+++ b/Plugins/Nautilus.Game.Arcade/.classpath
@@ -7,7 +7,7 @@
-
+
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java
index 46f59cb4b..fc5545a35 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java
@@ -1,20 +1,16 @@
package nautilus.game.arcade.game.games.halloween.creatures;
-import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.game.Game;
-import net.minecraft.server.v1_6_R3.Entity;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftGhast;
-import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
import org.bukkit.entity.Ghast;
import org.bukkit.event.entity.EntityTargetEvent;
-import org.bukkit.util.Vector;
public class MobGhast extends CreatureBase
{
@@ -27,7 +23,6 @@ public class MobGhast extends CreatureBase
public void SpawnCustom(Ghast ent)
{
UtilEnt.Vegetate(ent);
- ((CraftGhast)GetEntity()).getHandle().a(1f, 1f, 0.02f);
}
@Override
@@ -45,19 +40,7 @@ public class MobGhast extends CreatureBase
@Override
public void Update(UpdateEvent event)
{
- if (true)
- return;
- if (event.getType() == UpdateType.TICK)
- Move();
-
- if (event.getType() == UpdateType.SEC)
- Destroy();
- }
-
- private void Destroy()
- {
- Host.Manager.GetExplosion().BlockExplosion(UtilBlock.getInRadius(GetEntity().getLocation().add(0, 8, 0), 6d).keySet(), GetEntity().getLocation().add(0, 8, 0), false);
}
private void Move()
@@ -65,8 +48,6 @@ public class MobGhast extends CreatureBase
if (GetTarget() == null)
SetTarget(GetPlayerTarget());
- Vector vel = UtilAlg.getTrajectory(GetEntity().getLocation(), GetTarget());
-
((CraftGhast)GetEntity()).getHandle().i = GetTarget().getX();
((CraftGhast)GetEntity()).getHandle().j = GetTarget().getY();
((CraftGhast)GetEntity()).getHandle().bn = GetTarget().getZ();