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
MrTwiggy
5c9ee3e79e
Add ServerCommand system for live cross-server commands,. Update Queuer to support Redis based database and functionality. Fix ServerStatus start up dates to synchronize properly with central Redis time. Add new DataRepository's for easier dynamic object storage in redis. Update Portal server-transfers to support new cross-server command system rather than database stored server transfers.
2014-09-21 20:42:47 -04:00
Jonathan Williams
d0edde9dbd
Added rank benefit giver 9000
...
Added MineStrike to beta timer.
Updated official craftbukkit.jar
2014-09-19 02:57:35 -10:00
Jonathan Williams
1ea660df3a
Update craftbukkit with new patch file
2014-09-05 16:59:29 -05:00
Shaun Bennett
0ad844d1b5
Merge remote-tracking branch 'origin/master'
2014-09-05 16:35:26 -05:00
Shaun Bennett
b96ba09857
Update CraftBukkit to latest spigot changes. Includes title and tab packets
2014-09-05 16:35:00 -05:00
CoderTim
91a2266a04
Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking
2014-09-05 04:00:51 -04:00
Jonathan Williams
a4871b5509
Updated to latest spigot with 1.8 support.
...
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
2014-09-03 03:46:24 -07:00
Shaun Bennett
f60a818e6a
Update craftbukkit to remove the extra _INVALID mappings
2014-08-19 21:22:04 -05:00
Shaun Bennett
e1a57a673e
Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors
2014-08-19 16:58:55 -05:00
CoderTim
19222c6815
Updated IntelliJ environment to be compatible with latest changes
2014-08-15 15:51:29 -04:00
Jonathan Williams
6039168601
Updated code base to build #1604 spigot
2014-08-13 18:57:37 -05:00
Ty
6a9255e97b
Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.
2014-08-01 17:56:29 -04:00
Jonathan Williams
1207ed8199
Added DDOSProtectionSwitcher email functionality
...
mineplex.core.Server cleanup.
Refactored RepositoryBase.
Implemented core functionality of Friends
2014-07-14 22:58:36 -07:00
Jonathan Williams
449fa13cc3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
...
Conflicts:
.gitignore
2014-05-27 02:23:22 -07:00
Jonathan Williams
0634ee5543
Removed unused global stuff in Mineplexer.
...
Did some edits in GroupManager...need to pick that up.
Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection
Work on Elo manager.
Work on Queue.
Added checking for player to server transfer records.
Added option for rejoin time in TeamGame (UHC...yay)
2014-05-27 02:10:29 -07:00
CoderTim
3859a42f1d
Removed broken and obsolete shifter code
...
Set up more intellij stuff
2014-05-25 19:11:58 -04:00
Jonathan Williams
6af5d9205b
Added TimeUtil.java
...
Removed double gems.
Removed extra world uninitialize.
Changed AccountAdministrator to use UUID.
2014-05-13 22:13:48 -05:00
Jonathan Williams
0ec08d5208
Fixed chunk load outside borders (disabled for testing right now)
2014-05-09 21:18:38 -07:00
Jonathan Williams
f623026dfc
Fixed projectile order issue..check for dead before collision.
...
Fixed dead chunks in Aracde.
2014-05-04 12:52:04 -07:00
