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

Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear

Browse Source
This commit is contained in:
Ty Sayers 2015-08-27 14:55:33 -07:00
commit ff13f51151
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
View File

@ -199,9 +199,10 @@ public class PacketPlayOutPlayerInfo extends Packet {
public static boolean isAprilFools() public static boolean isAprilFools()
{ {
Calendar c = Calendar.getInstance(); // Calendar c = Calendar.getInstance();
// return true; // return true;
return c.get(Calendar.MONTH) == Calendar.APRIL && c.get(Calendar.DAY_OF_MONTH) == 1; // return c.get(Calendar.MONTH) == Calendar.APRIL && c.get(Calendar.DAY_OF_MONTH) == 1;
return false;
} }
} }

3
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
View File

@ -7,6 +7,8 @@ import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import net.minecraft.server.v1_7_R4.MinecraftServer; import net.minecraft.server.v1_7_R4.MinecraftServer;
import mineplex.core.TablistFix;
import mineplex.core.account.CoreClientManager; import mineplex.core.account.CoreClientManager;
import mineplex.core.achievement.AchievementManager; import mineplex.core.achievement.AchievementManager;
import mineplex.core.antihack.AntiHack; import mineplex.core.antihack.AntiHack;
@ -107,6 +109,7 @@ public class Clans extends JavaPlugin
new ObserverManager(this); new ObserverManager(this);
new TablistFix(this);
new MemoryFix(this); new MemoryFix(this);
new Explosion(this, blockRestore); new Explosion(this, blockRestore);
new FriendManager(this, _clientManager, preferenceManager, portal); new FriendManager(this, _clientManager, preferenceManager, portal);

3
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
View File

@ -504,9 +504,6 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
for (Player other : UtilServer.getPlayers()) for (Player other : UtilServer.getPlayers())
{ {
if (other.equals(event.getPlayer()))
continue;
ClanInfo otherClan = _clanUtility.getClanByPlayer(other); ClanInfo otherClan = _clanUtility.getClanByPlayer(other);
if (otherClan == null) if (otherClan == null)