Commit Graph

122 Commits

Author SHA1 Message Date
libraryaddict ddf7528796 Updated CB 2015-11-24 23:45:22 +13:00
libraryaddict cfeafff2f6 EntityDismountEvent stuff 2015-11-22 14:44:32 +13:00
libraryaddict e5b376bc5c Fixed wrong CB 2015-11-16 12:48:26 +13:00
libraryaddict 6e55074211 Add entitydismountevent 2015-11-16 06:56:39 +13:00
libraryaddict f18c55cbd9 Fix schedulers 2015-11-11 11:45:17 +13:00
libraryaddict 6983af944f Fix a craftbukkit bug 2015-11-11 00:25:20 +13:00
libraryaddict 1999e09e69 Update CB 2015-11-09 02:44:16 +13:00
libraryaddict ce3af6cf9c Update cb.jar 2015-11-09 00:15:28 +13:00
libraryaddict e039f2249c Update cb 2015-11-08 18:02:36 +13:00
libraryaddict c25b1969de More progress 2015-11-04 04:00:53 +13:00
libraryaddict 388aa1611c Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate 2015-10-30 15:44:37 +13:00
libraryaddict de9678a20f Modify Craftbukkit 2015-10-23 21:28:01 +13:00
libraryaddict 3cd803cda0 Update patch files and cb 2015-10-22 08:07:10 +13:00
libraryaddict 5c010af8c4 Add updatehealth packet 2015-10-21 19:56:52 +13:00
libraryaddict 8ceb69513a Update patches and cb.jar 2015-10-21 05:05:27 +13:00
libraryaddict 55f97ef984 More fixes, along with a fix for Block Hunt 2015-10-19 06:21:16 +13:00
libraryaddict 70c76d976f More changes 2015-10-16 22:10:13 +13:00
libraryaddict 3dda9352e7 Progress 2015-10-16 13:32:23 +13:00
libraryaddict 4205dc6c25 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-15 12:34:34 +13:00
libraryaddict dab258dcdd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Libraries/BungeeCord.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
	Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
2015-10-12 16:22:52 +13:00
Shaun Bennett 993c9783ec Add Votifier Jar, display team stats for SG, SW, SSM 2015-10-02 13:15:02 -04:00
Jonathan Williams 74fd729975 Updated BungeeCord to latest version. 2015-08-23 15:48:03 -07:00
Shaun Bennett 5895adaeca Update Craftbukkit to latest spigot build 2015-07-27 19:40:35 -05:00
Shaun Bennett da3500cc32 Merge remote-tracking branch 'remotes/origin/master' into MC_1.8
# Conflicts:
#	Plugins/Libraries/craftbukkit.jar
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
#	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseLiving.java
#	Plugins/Mineplex.Core/src/mineplex/core/map/BlockMap.java
#	Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java
#	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
#	Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
#	Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
2015-07-27 19:39:18 -05:00
Shaun Bennett cc1219fd38 [Spigot] Spigot class change for Ty 2015-05-28 15:24:10 -05:00
Jonathan Williams b7cdc82cd2 Fixed server sorter for UHC.
Work on converting to UltraDNS api.
2015-05-14 00:12:13 -07:00
Shaun Bennett c3a7dcfcf8 Update craftbukkit jar 2015-05-03 15:35:42 -05:00
Shaun Bennett 17cbcc3771 Craftbukkit changes for UtilParticle update, and UtilParticle fix 2015-05-03 14:42:31 -05:00
Jonathan Williams b33828f5a1 Added LibraryAddict's crash exploit patch for craftbukkit.jar 2015-04-30 23:48:58 -05:00
Shaun Bennett 20b5ee8b65 More spigot build changes 2015-04-23 08:20:07 -04:00
Shaun Bennett cf4353bedf Delete some classpath dummy changes, jsonmessage fixed 2015-04-22 16:37:45 -04:00
Shaun Bennett 50ff48ffba Packet changes to spigot build 2015-04-22 16:20:39 -04:00
Shaun Bennett 9ee740d334 Updated craftbukkit to latest spigot (local repo was a few commits behind) 2015-04-21 20:28:22 -04:00
Shaun Bennett 1e304ff205 Update BungeeCord to latest build 2015-04-21 20:19:20 -04:00
Shaun Bennett f91345bce0 Update craftbukkit modified to 1.8 build 2015-04-21 20:18:56 -04:00
Jonathan Williams 6472194d44 Optimized queries to retrieve and update player information by removing inner join calls on the account.
Added account id retrieval on login.
Added account id caching in redis.
2015-03-25 15:10:59 -07:00
Jonathan Williams ca9ebbb1bd Updated NoCheatPlus.jar - Removed VehicleExit check because we don't use and we altered the event.
It spammed consoles when people dismounted from non-vehicles.
2015-03-12 04:09:38 -07:00
CoderTim 44f453c56e Updated jOOQ and database tables 2015-02-18 18:51:36 -05:00
Jonathan Williams 44bab01e33 Added NoCheatPlus hook for double jump fly hack prevention. 2015-02-04 21:52:14 -08:00
Jonathan Williams 80c17c789c Updated BungeeCord to newest custom version. 2014-12-13 20:21:34 -05:00
Shaun Bennett 14c6c1ca4b Merge pull request #6 from feature/animated-motd to master
* commit 'b65ca5f7dd8e07d2d65e59d08a7d907d29b172d6':
  Update bungee cord, comment out debug stuff
  Fix icon animation + some more tweaks
  Some adjustments
  Motd stuff for xmas update
  pushing this for my laptop. not final code!
2014-12-12 02:54:30 -06:00
Shaun Bennett 93dc3c9090 pushing this for my laptop. not final code! 2014-12-11 09:17:19 -06:00
Chiss 3af8a90d3b near final xmas push :D 2014-12-11 15:23:01 +11:00
Jonathan Williams 11e09b202c Fixed PullWhileLeashed bug and ghost bug. 2014-12-10 03:34:05 -08:00
Shaun Bennett cf25d17c66 Update craftbukkit.jar with command event 2014-11-10 23:53:08 -06:00
Shaun Bennett 62d4804aa6 Update Craftbukkit.jar for new chat features 2014-10-15 11:10:28 -05:00
CoderTim 3ba748f2de Merge branch 'feature/currency-log' 2014-10-13 23:13:44 -04:00
Shaun Bennett 1bb3f23ba4 Update craftbukkit.jar with 1.8 scoreboard team nametag visibility 2014-10-05 21:17:32 -05:00
CoderTim ba2f0e37ef Log changes in players' coins to database 2014-09-25 17:03:26 -04:00
CoderTim efb3c26115 Switched back to the latest craftbukkit.jar 2014-09-22 03:59:28 -04:00