JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsd6gty72 tjn6g wgh

This commit is contained in:
Chiss 2013-10-25 22:20:46 +11:00
parent 61b7a86b67
commit e8ddfc266e
7 changed files with 217 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Plugins/Libraries/craftbukkit.jar
View File

Binary file not shown.

2
Plugins/Mineplex.Core/.classpath
View File

@ -2,11 +2,11 @@
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
<classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core.CraftBukkit"/> <classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core.CraftBukkit"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpcore-4.2.jar"/> <classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpcore-4.2.jar"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpclient-4.2.jar"/> <classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpclient-4.2.jar"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/bin/craftbukkit.jar"/> <classpathentry kind="var" path="REPO_DIR/Plugins/bin/craftbukkit.jar"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-codec-1.6.jar"/> <classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-codec-1.6.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

4
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
View File

@ -6,7 +6,7 @@ import java.util.HashSet;
import mineplex.core.account.event.AsyncClientLoadEvent; import mineplex.core.account.event.AsyncClientLoadEvent;
import mineplex.core.account.event.ClientUnloadEvent; import mineplex.core.account.event.ClientUnloadEvent;
import mineplex.core.account.event.ClientWebResponseEvent; 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.AccountRepository;
import mineplex.core.account.repository.token.ClientToken; import mineplex.core.account.repository.token.ClientToken;
import mineplex.core.common.Rank; import mineplex.core.common.Rank;
@ -151,7 +151,7 @@ public class CoreClientManager implements Listener
try try
{ {
Bukkit.getServer().getPluginManager().callEvent(new RetrieveClientInformationEvent(connection)); //Bukkit.getServer().getPluginManager().callEvent(new RetrieveClientInformationEvent(connection));
} }
catch (Exception exception) catch (Exception exception)
{ {

9
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
View File

@ -5,10 +5,10 @@ import mineplex.core.recharge.Recharge;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.account.CoreClientManager; 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.BroadcastCommand;
import mineplex.core.chat.command.SilenceCommand; 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.Rank;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
@ -25,7 +25,7 @@ import org.bukkit.plugin.java.JavaPlugin;
public class Chat extends MiniClientPlugin<ChatClient> public class Chat extends MiniClientPlugin<ChatClient>
{ {
private CoreClientManager _clientManager; private CoreClientManager _clientManager;
private ChatRepository _repository; //private ChatRepository _repository;
private long _silenced = 0; private long _silenced = 0;
@ -44,12 +44,13 @@ public class Chat extends MiniClientPlugin<ChatClient>
AddCommand(new BroadcastCommand(this)); AddCommand(new BroadcastCommand(this));
} }
/*
@EventHandler @EventHandler
public void retrieveClientInformation(RetrieveClientInformationEvent event) public void retrieveClientInformation(RetrieveClientInformationEvent event)
{ {
_repository.loadClientInformation(event.getConnection()); _repository.loadClientInformation(event.getConnection());
} }
*/
public void Silence(long duration, boolean inform) public void Silence(long duration, boolean inform)
{ {
//Set Silenced //Set Silenced

11
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/EntityGhast.java
View File

@ -53,7 +53,18 @@ public class EntityGhast extends EntityFlying implements IMonster {
} }
if (Vegetated) 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;
this.motX += d0 / d3 * 0.1D;
this.motY += d1 / d3 * 0.1D;
this.motZ += d2 / d3 * 0.1D;
return; return;
}
this.u(); this.u();
this.bo = this.bp; this.bo = this.bp;

2
Plugins/Nautilus.Game.Arcade/.classpath
View File

@ -7,7 +7,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core.CraftBukkit"/> <classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core.CraftBukkit"/>
<classpathentry combineaccessrules="false" kind="src" path="/Core"/> <classpathentry combineaccessrules="false" kind="src" path="/Core"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar" sourcepath="/REPO_DIR/GitHubLibraries/CraftBukkit/src"/> <classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar" sourcepath="/REPO_DIR/GitHubLibraries/CraftBukkit/src"/>
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core"/>
<classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core"/> <classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core"/>
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

19
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java
View File

@ -1,20 +1,16 @@
package nautilus.game.arcade.game.games.halloween.creatures; 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.UtilBlock;
import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilEnt;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.Game;
import net.minecraft.server.v1_6_R3.Entity;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftGhast; 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.entity.Ghast;
import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.EntityTargetEvent;
import org.bukkit.util.Vector;
public class MobGhast extends CreatureBase<Ghast> public class MobGhast extends CreatureBase<Ghast>
{ {
@ -27,7 +23,6 @@ public class MobGhast extends CreatureBase<Ghast>
public void SpawnCustom(Ghast ent) public void SpawnCustom(Ghast ent)
{ {
UtilEnt.Vegetate(ent); UtilEnt.Vegetate(ent);
((CraftGhast)GetEntity()).getHandle().a(1f, 1f, 0.02f);
} }
@Override @Override
@ -45,19 +40,7 @@ public class MobGhast extends CreatureBase<Ghast>
@Override @Override
public void Update(UpdateEvent event) 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() private void Move()
@ -65,8 +48,6 @@ public class MobGhast extends CreatureBase<Ghast>
if (GetTarget() == null) if (GetTarget() == null)
SetTarget(GetPlayerTarget()); SetTarget(GetPlayerTarget());
Vector vel = UtilAlg.getTrajectory(GetEntity().getLocation(), GetTarget());
((CraftGhast)GetEntity()).getHandle().i = GetTarget().getX(); ((CraftGhast)GetEntity()).getHandle().i = GetTarget().getX();
((CraftGhast)GetEntity()).getHandle().j = GetTarget().getY(); ((CraftGhast)GetEntity()).getHandle().j = GetTarget().getY();
((CraftGhast)GetEntity()).getHandle().bn = GetTarget().getZ(); ((CraftGhast)GetEntity()).getHandle().bn = GetTarget().getZ();