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

Fixes for Custom tag

Browse Source 
Fix for Bridge time
Fix for tournament auto whitelist.
Added UI stuf for tourney

Added build files for arcade.
This commit is contained in:
Jonathan Williams 2014-09-13 20:50:27 -10:00
parent 7ad7dd939d
commit a395cae764
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/BuildFiles/common.xml
View File

@ -17,6 +17,9 @@
<fileset dir="../Mineplex.Minecraft.Game.Core/bin"> <fileset dir="../Mineplex.Minecraft.Game.Core/bin">
<include name="**/*.class"/> <include name="**/*.class"/>
</fileset> </fileset>
<fileset dir="../Mineplex.Database/bin">
<include name="**/*.class"/>
</fileset>
<fileset dir="../Nautilus.Game.Arcade"> <fileset dir="../Nautilus.Game.Arcade">
<include name="*.yml"/> <include name="*.yml"/>
</fileset> </fileset>

7
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
View File

@ -78,17 +78,20 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler
PacketPlayOutSpawnEntityLiving spawnPacket = (PacketPlayOutSpawnEntityLiving)packet; PacketPlayOutSpawnEntityLiving spawnPacket = (PacketPlayOutSpawnEntityLiving)packet;
// Ignore Armor stand packets // Ignore Armor stand packets
if (spawnPacket.b == 30) if (spawnPacket.b == 30 || spawnPacket.l == null || spawnPacket.l.c() == null || spawnPacket.a == 777777)
{ {
return; return;
} }
for (WatchableObject watchable : (List<WatchableObject>)spawnPacket.l.b()) for (WatchableObject watchable : (List<WatchableObject>)spawnPacket.l.c())
{ {
if ((watchable.a() == 11 || watchable.a() == 3) && watchable.b() instanceof Byte) if ((watchable.a() == 11 || watchable.a() == 3) && watchable.b() instanceof Byte)
{ {
final String entityName = spawnPacket.l.getString(10); final String entityName = spawnPacket.l.getString(10);
if (entityName.isEmpty())
return;
if (_entityMap.get(owner).containsKey(spawnPacket.a)) if (_entityMap.get(owner).containsKey(spawnPacket.a))
{ {
verifier.bypassProcess(new PacketPlayOutEntityDestroy(_entityMap.get(owner).get(spawnPacket.a))); verifier.bypassProcess(new PacketPlayOutEntityDestroy(_entityMap.get(owner).get(spawnPacket.a)));

3
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
View File

@ -499,6 +499,9 @@ public class ServerManager extends MiniPlugin
if (_clientManager.Get(partyPlayer).GetRank().Has(Rank.ULTRA) || _donationManager.Get(partyPlayer.getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA")) if (_clientManager.Get(partyPlayer).GetRank().Has(Rank.ULTRA) || _donationManager.Get(partyPlayer.getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA"))
continue; continue;
if (serverInfo.Name.contains("T_"))
continue;
partyPlayer.leaveVehicle(); partyPlayer.leaveVehicle();
partyPlayer.eject(); partyPlayer.eject();

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -147,11 +147,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation
super("Game Manager", plugin); super("Game Manager", plugin);
_serverConfig = serverConfig; _serverConfig = serverConfig;
if (serverConfig.Tournament)
{
AntiHack.Instance.SetEnabled(false);
Bukkit.getServer().setWhitelist(true);
}
// Modules // Modules
_antistack = antistack; _antistack = antistack;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
View File

@ -79,7 +79,7 @@ public class Bridge extends TeamGame implements OreObsfucation
private static final Material[] PLAYER_DROP_DELAY_MATERIALS = new Material[] { Material.LOG, Material.LOG_2, Material.IRON_ORE, Material.DIAMOND_ORE, Material.COAL_ORE, Material.GOLD_ORE, Material.WORKBENCH, Material.FURNACE }; private static final Material[] PLAYER_DROP_DELAY_MATERIALS = new Material[] { Material.LOG, Material.LOG_2, Material.IRON_ORE, Material.DIAMOND_ORE, Material.COAL_ORE, Material.GOLD_ORE, Material.WORKBENCH, Material.FURNACE };
//Bridge Timer //Bridge Timer
private int _bridgeTime = 5000; //600000 private int _bridgeTime = 600000;
private boolean _bridgesDown = false; private boolean _bridgesDown = false;
//Wood Bridge //Wood Bridge