d47b494628
Add /chatcache (mainly for debugging).
...
Fix cache not being able to store more than 1 value per sender.
Add comparator to sort all messages chronologically.
2015-11-26 23:29:43 +00:00
edf93ec43f
Initial ChatSnap implementation.
2015-11-26 16:55:27 +00:00
0d43ffc7b2
fixessss
2015-11-26 06:54:49 +00:00
3e8a53562e
Add new hologram interaction thingy so holograms can catch interactions that they would normally block
2015-11-26 15:49:28 +13:00
1306137cb2
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-25 14:51:00 -05:00
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
2adfef41ca
bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 )
2015-11-25 16:46:53 +00:00
3b89d65a09
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
2015-11-25 15:59:18 +01:00
ca81265b9e
Readded PacketHandler debug message
2015-11-25 13:42:11 +13:00
837be048a6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 21:38:47 +11:00
f8d8b75586
Changed how timings is used.
2015-11-24 04:36:18 -06:00
f300fd2c98
Merge remote-tracking branch 'origin/master' into foo
2015-11-23 15:34:27 -08:00
ef7c26c04c
Clans changes
2015-11-23 15:57:13 -05:00
a551e89310
fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT
2015-11-23 09:44:35 +00:00
f0e24468d5
Enable reporting functionality for Arcade and Clans plugins.
2015-11-22 14:23:17 +00:00
dcca67e571
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-22 13:54:16 +00:00
3bb11bba08
- Fixed Stats [caused by bad communication between chiss and I]
2015-11-21 11:30:53 -05:00
6eb1bef1c6
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-11-21 11:09:28 +11:00
5bbf5bcce5
Only log to the database when the report has been closed.
2015-11-20 23:05:42 +00:00
d5076b1c47
CTF fix
2015-11-21 09:41:02 +11:00
07b6c7cde7
Display message informing a report handler on how to close a report, when clicked this message will also fill out as much of the command as it can on the clients side.
2015-11-20 22:38:00 +00:00
435f2b643d
Fix fetching player report stats.
2015-11-20 22:20:56 +00:00
470ff67f86
Replace ReportProfile by using statistics to track total reports and accepted, denied & abusive reports. 1 or more abusive reports results in being banned from the report system.
2015-11-20 22:03:57 +00:00
fc6e1fe003
Notify the handler of a report (if any) when the report they are handling is purged.
2015-11-20 21:10:03 +00:00
386032a4f5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-20 06:03:30 -05:00
f51358552a
-B
2015-11-20 05:57:29 -05:00
700e4c9a1f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-19 22:12:08 -06:00
80c87fa1fc
Make reports timeout after 15 minutes of inactivity.
2015-11-20 00:51:21 +00:00
3a5ab3f17c
Merge branch 'master' into monster-league
2015-11-20 11:51:07 +11:00
3820035762
Cleaning up duplicate code/small optimizations (untested)
2015-11-19 14:35:59 -05:00
cb5672b94c
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-18 20:34:24 +00:00
5c2569e822
revert certain permissions from being ALL or containing JR.DEV (that were used for testing)
2015-11-18 16:20:27 +00:00
1eff698a34
Merge pull request #75 in MIN/mineplex from william-global to master
...
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
ranks
woops easy fix
rawr and fixes
Added the ability to give out game loot.
Reformatting titles
Added GlobalGiveCoins. Changes Gems a little and the manager.
More global stuff! Added GlobalGiveGems.
Global Packet work. Added giveitem sub-command.
2015-11-18 10:15:33 -06:00
a11ca138e7
ranks
2015-11-18 16:01:53 +00:00
04a4b072af
woops easy fix
2015-11-18 15:48:25 +00:00
2e223d0660
rawr and fixes
2015-11-18 15:42:33 +00:00
e16ee9036a
Added the ability to give out game loot.
2015-11-18 14:35:40 +00:00
e83b49d490
Reformatting titles
2015-11-18 13:43:22 +00:00
f79c282225
Clan energy warnings implemented. (not tested yet)
2015-11-18 07:39:00 +00:00
e19d4e11e1
Added GlobalGiveCoins. Changes Gems a little and the manager.
2015-11-17 18:54:39 +00:00
a28adc9673
More global stuff! Added GlobalGiveGems.
2015-11-17 18:26:19 +00:00
6ee40aa1ce
No longer close reports when the player quits, instead alert the handler and alert again when (and if) the player re-joins if the report is still active.
2015-11-17 15:08:35 +00:00
a1713ca866
If someone is currently handling a report, re-direct all messages relating to that report to them.
2015-11-17 14:21:05 +00:00
0f7c52391f
Global Packet work. Added giveitem sub-command.
2015-11-17 08:19:36 +00:00
adfc2f19eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-17 09:20:15 +11:00
46505a8e8e
converted to new res pack locations
2015-11-17 09:19:33 +11:00
208d90c4bc
Fixed getTargetBlock being 0 when its infinite
2015-11-17 10:18:42 +13:00
ac792dcd02
Removed some unnecessary code in updateRank and opened up all ranks to be used.
2015-11-15 18:33:43 -06:00
217509b75a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Conflicts Resolved
2015-11-15 18:58:20 -05:00
ecaa4a49b4
- Fix for stats
2015-11-15 17:48:00 -05:00
24dee0ebf6
updated ScoreboardElement to use the interface instead of the implementation. PLEASE NEVER USE THE IMPLEMENTATION FOR DEFINING THE TYPE!!!
2015-11-15 20:52:45 +00:00
c247fe9317
World event prettification and fixes
2015-11-15 18:19:28 +00:00
db21d627d8
Merge remote-tracking branch 'origin/master' into foo
2015-11-14 09:13:51 -08:00
daee44d262
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-14 02:01:24 -06:00
4a73bce586
Added gadget and projectileUser logging.
2015-11-14 00:36:34 -06:00
259397b6ae
READY 2 GO
2015-11-14 12:52:14 +11:00
bf81c26874
Only notify staff when a report count reaches a certain amount (3 for hacking, 1 for chat abuse).
2015-11-13 01:27:34 +00:00
a6d3ba10c2
Show the handler of the report a message every 10 seconds whilst they are handling a report. Any part of the message is clickable and when clicked shows the close report GUI.
...
Jazz-up messages sent to players.
Rename Category to ReportCategory.
2015-11-13 01:23:33 +00:00
bbc7bf770c
1.8 Fixes - Still doing map fix
2015-11-12 19:18:42 -05:00
639d2d110f
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
2015-11-12 17:55:33 -05:00
0b41450603
Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""
...
This reverts commit 6c17b2926c
2015-11-12 17:51:13 -05:00
3122397f7a
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
2015-11-13 09:19:44 +11:00
6c17b2926c
Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"
...
This reverts commit ce1c09b88f1aef7fe0b9
2015-11-12 16:35:31 -05:00
bc1b185f0e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-12 02:44:54 -05:00
a8b27e66d1
- Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit
...
- Fixed items ever being lost from treasurechests
2015-11-12 00:06:21 -05:00
8a0906587d
Merge remote-tracking branch 'origin/master' into foo
2015-11-11 20:15:31 -08:00
875c399c9f
Merge branch 'master' into clans-beta
2015-11-11 21:31:03 -05:00
27d5c76376
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-12 02:01:01 +00:00
25f299b490
Fix interact types
2015-11-12 14:34:12 +13:00
3c419b3217
Small fixes from last commit.
2015-11-12 00:24:31 +00:00
6295a8ce08
Closing a report will now display a GUI in which the closer can decide on the result of the report. Some of these options will yield additional options, such as punishment options if a report is indeed valid.
...
Store count of a players accepted, denied and abusive reports.
The previous partially implemented reputation system has been removed, at least for now.
2015-11-12 00:02:38 +00:00
e66bebcfb1
Give all treaure items when opening the chest
2015-11-11 18:13:47 -05:00
ce1c09b88f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
Plugins/Libraries/craftbukkit.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
2015-11-11 19:35:44 +00:00
9573751a87
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-11 19:24:34 +00:00
727da2c6b5
Embarrassing typo.
2015-11-11 19:23:10 +00:00
f2e88c1c54
Only allow 1 player at a time to handle a report.
2015-11-11 19:05:29 +00:00
d7ba2e4731
Fix infinite gson loop by separating dependencies.
2015-11-11 16:12:28 +00:00
b915131407
Fix some armorstands and interaction bugs
2015-11-12 04:26:55 +13:00
9c45a48a26
Add confirmation message when a report is successful.
2015-11-11 15:05:36 +00:00
2722aeaaec
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-11 14:53:49 +00:00
191fa0ec53
Actually fetch the showUserReports value from the database.
2015-11-11 14:53:22 +00:00
ef2411b7d5
Merge branch 'master' into minestrike-update
2015-11-11 13:43:36 +11:00
3e6d73221b
Disabled a fix
2015-11-11 15:21:17 +13:00
a47752cfe2
disabled usage of /minecraft: commands in 1..8
2015-11-11 12:49:19 +11:00
f1c8564263
Fix preference inventory.
2015-11-10 21:40:35 +00:00
7d63a95ec9
Remove ALTER statement, modifications have been done.
2015-11-10 21:22:21 +00:00
59a054eeba
fixed merge erorr
2015-11-11 07:52:02 +11:00
520eb55b88
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-11-11 07:43:50 +11:00
a81da156ac
Load show user reports value from database.
2015-11-10 16:08:16 +00:00
e59b5c2549
Actually show the report toggle action.
2015-11-10 16:07:32 +00:00
394d680470
Merge remote-tracking branch 'origin/master' into monster-league
2015-11-10 07:09:19 -08:00
ca1177685f
totally WIP commit
2015-11-10 07:08:08 -08:00
217ac78d49
Alter "accountPreferences" table to include a new column "showUserReports".
2015-11-10 11:38:13 +00:00
e00c11ae28
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-10 11:17:49 +00:00
e165cad50f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-10 04:53:32 -05:00
2707173a8b
Merge with 1.8 Branch
2015-11-10 01:48:33 -05:00
47c509c975
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-11-09 22:55:00 +00:00
03a5954224
Handle saving and loading of the ShowUserReports setting.
2015-11-09 18:35:03 +00:00
ec3427bcc0
Giveaway manager bug fix
2015-11-09 04:08:26 -05:00
7a8a5918c0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/.idea/dataSources.xml
Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
** CONFLICTS ALL FIXED **
2015-11-09 08:59:37 +00:00
05b52614fe
Forgot to remove debug code for testing
2015-11-09 03:49:12 -05:00
2eaa326929
Merge remote-tracking branch 'origin/master'
2015-11-09 03:27:50 -05:00
2c54e9e59a
Giveaway extras
2015-11-09 03:27:42 -05:00
fb4978305f
Fixed up EnjinTranslator
...
Added extra overload for inventoryManager if you have the accountId already.
2015-11-09 02:26:45 -06:00
283a774e03
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-09 00:04:55 -06:00
4915ebc5ad
Added Purchase logging manager for Enjin.
...
Added extra callback method for SaveRank.
2015-11-09 00:04:38 -06:00
d466005c35
Fix custom names not changing
2015-11-09 05:08:08 +13:00
752d8152d2
Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master
...
* commit '783bec75db7592dc191698b8dfbb89be08a818aa':
Fix for some preferences not applying correctly.
2015-11-08 08:23:20 -06:00
dfbf19c66a
Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-08 01:02:06 -05:00
c4d6bcba02
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-11-08 17:56:34 +13:00
cc2e5bc6e4
minestrike update!
2015-11-08 11:30:19 +11:00
addde570bb
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-07 14:53:35 -05:00
bf97cf5d77
Remove debug code
2015-11-07 13:53:34 -05:00
79d0466355
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/Arcade.java
2015-11-07 21:36:36 +13:00
ec7600a4a2
Giveaway tweaks
2015-11-07 01:10:27 -05:00
4add7449eb
Merge remote-tracking branch 'origin/master'
2015-11-06 21:15:45 -05:00
3893617d58
Logitech Giveaway (still needs testing)
2015-11-06 21:15:37 -05:00
fafc92606c
Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
2015-11-06 18:43:11 -05:00
783bec75db
Fix for some preferences not applying correctly.
2015-11-06 23:04:51 +00:00
fd2a543418
Add "ShowUserReports" preference (however currently not visible to players nor does it get saved to the DB currently).
...
Fix variable names in ReportManager.
2015-11-06 16:46:10 +00:00
cc0f12f6c8
Fix player interactions packets not working properly on armorstand and when clicking block behind entity
2015-11-07 04:45:02 +13:00
b835823230
Preferences page changes to free up space, as the current preferences layout is completely full.
...
Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.
2015-11-06 13:19:02 +00:00
0c0b3708c6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-06 01:34:13 +00:00
e449e47b9a
Document ReportNotification.
2015-11-06 01:33:46 +00:00
87d7ff8a8f
- Synced up expire times for proximity weapons
2015-11-05 02:21:36 -05:00
61653347c7
- Fixed proximity weapons not being able to detonate
2015-11-05 02:11:20 -05:00
9c49ab0408
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-05 01:23:40 -05:00
3ff044fddb
Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips
2015-11-04 11:32:06 +00:00
b3f86ba638
Fixing bugs
2015-11-04 18:34:22 +13:00
ecd3b0ef76
removed a multiple Mineplex.Core.Common import thingy in the core project or something. i dunno, it was causing errors so i fixed it, yay!
2015-11-03 22:06:23 +00:00
7f03ca0936
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
2015-11-03 21:19:17 +00:00
78ab895a14
Added heart particles to the GiantsBroadsword healing feature, also added some strong sounds.
...
Made it so that players using the broadsword's effects cannot attack anything.
Added small smoke particle to UtilParticle.
Added a burnout feature to the WindBlade, disallowing players to speed around on the ground for ever.
Moved the Lapis Lazuli block particles from infront of the player, to the feet of the player when using the AlligatorsTooth, as per SamitoD's request.
Removed some debug messages thrown around the code.
2015-11-03 19:49:14 +00:00
72b650086d
Instantiating a page shouldn't cause it to automatically open.
2015-11-03 17:03:09 +00:00
bd6ce21cf7
Make use of foreign keys in table creation and drop "INDEX" statements (foreign keys are auto-indexed).
2015-11-03 16:40:31 +00:00
6054bfaac4
Do all database operations asynchronously.
2015-11-03 15:37:39 +00:00
9030b4f264
Remove unused column 'date'.
2015-11-03 15:27:32 +00:00
3de906ab19
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
2015-11-03 14:57:25 +13:00
4794cc6924
Clans Gui
2015-11-02 20:41:08 -05:00
95c38b1939
Don't use static instances.
2015-11-02 23:30:06 +00:00
8838ea75e4
Some code cleanup for tasks.
2015-11-02 09:37:11 -06:00
3b38302429
Optimized TaskManager task locks and calls.
...
Run all player messages on the main thread.
2015-11-02 09:35:35 -06:00
55d028d706
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-01 22:09:58 -06:00
9cf62cfe7f
Don't use player skulls until caching is setup and working properly
2015-11-01 22:58:22 -05:00
cb96124feb
Added extra cleanup for FriendsGUI and AddFriendPage
2015-11-01 17:42:23 -06:00
4b5ddf5385
Disable SQL create table queries until they are approved.
2015-11-01 19:14:29 +00:00
d09ed2a823
Small changes and missed changes from last commit.
2015-11-01 16:47:54 +00:00
93a5ebf0eb
Pass server name to ReportManager.
2015-11-01 16:44:02 +00:00
baa4a744fb
Fixed a whole load of bugs:
...
Fixed the next button occasionally displaying a blank page in the gear GUI.
Fixed not being able to click the back button when selecting a bow in the gear GUI.
Made selectable items glowing in the gear GUI.
2015-10-31 23:11:12 +00:00
073321fb14
Refactored TrickOrTreat Stuff.
2015-10-31 14:45:42 -05:00
b8b260bca1
fixed expire time on projectiles
2015-10-31 19:01:49 +11:00
c463b80fe0
fixed insta-expire
2015-10-31 19:00:28 +11:00
3636fdfba0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-31 18:23:06 +11:00
225f067ab3
fixed some projectile stuff
2015-10-31 18:22:53 +11:00
cd15df0238
Merge remote-tracking branch 'origin/master'
2015-10-31 02:13:24 -04:00
23be8aa1dd
removed unncessary stuff
...
balanced rewards
2015-10-31 14:33:41 +11:00
a92a52f009
Merge branch 'Myst_TRICKORTREAT'
2015-10-31 14:27:06 +11:00
4884032a1a
Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3
2015-10-30 23:24:32 -04:00
b9d7c80f80
cow kit
2015-10-31 13:25:57 +11:00
301b8012ff
Final commit
2015-10-30 19:30:17 +13:00
ea1e4b79f7
Changes from SnD branch
2015-10-30 19:25:02 +13:00
ed18588a6a
Fix missing code and stuff
2015-10-30 19:12:04 +13:00
c4e93180fa
Merge branch 'master' into smash-champs-balance
2015-10-30 13:00:30 +11:00
ec5cbbe684
This method is not required, "Plugin" is protected, not private as I previously assumed.
2015-10-30 01:05:45 +00:00
e266acaf44
Store report categories with a TINYINT to save space and increase lookup performance.
2015-10-29 23:33:23 +00:00
e8c01a1733
Cleanup imports.
2015-10-29 23:29:38 +00:00
0be51d5629
- Even more bugfixes
2015-10-29 16:48:51 -04:00
1857afa826
Log report category to database.
...
Allow report to easily be handled by clicking text to fire the reporthandle command.
2015-10-29 17:51:17 +00:00
e2947718fe
Remove code that wasnt meant to be commited
2015-10-29 13:10:10 -04:00
0486404c4b
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/Arcade.java
2015-10-28 14:38:34 +13:00
5ec932d1ca
Fixing bugs
2015-10-28 14:36:48 +13:00
dd321439a6
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-10-27 22:40:23 +00:00
4ceb8f20aa
Make ReportNotification capable of sending json messages.
2015-10-27 22:26:02 +00:00
cb1c779f37
Close player report if the reported player leaves the game mid-report.
2015-10-27 22:15:06 +00:00
d9fb0adabb
Only notify staff if 3 or more players report a player.
2015-10-27 22:14:33 +00:00
53f2356cba
Handle null report closers.
2015-10-27 22:08:42 +00:00
bc3a119a22
Store report category and only "merge" reports when the category is the same.
2015-10-27 17:30:47 +00:00
7770fa0284
- Added system to ensure banned players are removed from the network
2015-10-26 07:09:01 -04:00
f5b4f28848
- Fixed achievements
...
- Various balance patches/audio changes
2015-10-26 00:25:33 -04:00
cbe147d705
typo fix in legendary aura description
2015-10-25 12:32:27 -07:00
7024084ce3
Update achievement kit reference text
2015-10-25 11:29:06 -07:00
bb806d6260
Merge remote-tracking branch 'origin/master' into foo
2015-10-25 10:10:06 -07:00
327c129f46
Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}])
2015-10-25 12:28:12 +00:00
556d5adcd9
Change /global to /globalpacket (fixes conflict with announcement command)
2015-10-24 17:46:25 -04:00
1e4b3442fa
Conflicts:
...
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
2015-10-24 20:45:39 +01:00
0d56eefd44
Titan/Rewards adjustments
2015-10-24 13:40:17 -04:00
394e501682
Merge branch 'master' into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2015-10-24 17:50:26 +01:00
a9fedecc70
Make the ui more appealing and use existing gui system to handle it.
2015-10-24 17:10:50 +01:00
29587b93f7
Implement initial report interface.
...
Added getPlugin() method to CommandBase.
Changed mini-plugin name from "ReportPlugin" to "Report" to match the other mini-plugins.
This is very WIP, still a lot to be done.
2015-10-24 03:41:03 +01:00
40afcaf26b
Global Packet Commands
2015-10-23 15:07:53 -04:00
2eb8b3e234
Catch PacketHandler exceptions
2015-10-24 02:17:19 +13:00
5ec4203fd9
More changes to disguise
2015-10-24 01:36:42 +13:00
a450b828b7
Fix disguises custom name
2015-10-24 00:48:54 +13:00
f7dab72e8c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-10-23 03:23:35 -04:00
af208da953
Merge branch 'alex-testrank'
2015-10-23 18:10:59 +11:00
e3e7dd4694
Titan rewards from mythical chests
2015-10-23 02:08:31 -04:00
1512d87f9e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-23 00:28:32 -04:00
5a94e33d5e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-10-23 00:24:52 -04:00
aedf04b3e3
Fix renaming pet not opening proper window
2015-10-23 09:26:21 +13:00
53aa1b655b
Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix
2015-10-23 09:20:24 +13:00
8cde506a2c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-10-23 05:25:36 +13:00
ddb8d592f8
Remove all is1_8 checks
2015-10-22 18:37:14 +13:00
00a689ea03
War work
2015-10-21 14:48:27 -04:00
c719d693dd
Added delete benefit call for repository.
...
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
2015-10-21 01:15:09 -05:00
227e9f7bfc
Pretty much finished with tutorials, not fully though, but I am simply pushing so I don't lose all my work.
...
CHANGES----
Added a little hack to ScoreboardElement.java that allows for a single element to clear the currently existing scoreboard lines output, or modify it.
Coded in the functionality of 7 tasks, will do the rest now.
2015-10-21 04:27:14 +01:00
07f032a5d2
Fix wither pet making sounds, fixed worldtime.
2015-10-21 04:22:31 +13:00
ddd674e371
Packets implement Pcaket right
2015-10-20 17:19:46 +13:00
b3caf7c2d4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-10-20 04:38:12 +13:00
3ef33bd9c5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-19 01:32:23 -05:00
5e307da15a
Fix for inventory failure.
2015-10-19 01:32:12 -05:00
6d7f15cd6d
Fix hub time after light flicker
2015-10-18 18:52:16 -04:00
55f97ef984
More fixes, along with a fix for Block Hunt
2015-10-19 06:21:16 +13:00
177e482dbc
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2015-10-18 12:35:31 -04:00
9e7629b1fe
Added 43k player chest benefit.
...
Updated MOTD.
2015-10-18 00:21:01 -05:00
12319169a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
2015-10-18 00:54:18 -04:00
6f91827d57
Vector to Vector3f, updated Maze to 1.8
2015-10-18 12:40:01 +13:00
02bf202d52
1.8 update
2015-10-17 13:21:03 +13:00
3a0781b3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
2015-10-17 00:10:32 +13:00
14a524cf54
Stuff
2015-10-17 00:08:30 +13:00
f71cb80bd0
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/minestrike/MineStrike.java
2015-10-16 22:26:07 +13:00
70c76d976f
More changes
2015-10-16 22:10:13 +13:00
62b209fede
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-16 01:57:30 -05:00
d00fa856f3
Fixed Pets so they work correctly.
...
Also fixed legend benefits.
Fixed chest pet rewards.
2015-10-16 01:57:19 -05:00
577c67cacd
Merge branch 'Myst_HALLOWEEN'
2015-10-16 14:18:35 +11:00
b15b81a7e2
Spacing
2015-10-15 23:09:23 -04:00
6cc33fd6c6
Merge branch 'thanos-bug-fixes'
2015-10-16 12:53:43 +11:00
41511dce7b
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-15 21:19:24 -04:00
3dda9352e7
Progress
2015-10-16 13:32:23 +13:00
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
0df637b80a
Run punishBot in main server thread
2015-10-13 22:56:14 -04:00
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -04:00
a049d7666f
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-13 22:14:19 -04:00
45cd2a38e1
admins can botspam
2015-10-14 11:55:59 +11:00
88709f85b6
Merge with master
2015-10-13 18:13:01 -04:00
cb0d82174e
Apply botspam to chat messages as well
2015-10-13 17:41:25 -04:00
d105ea5d7e
botspam addition
2015-10-13 23:19:48 +11:00
58a86c5abb
That's the easy stuff done..
2015-10-13 19:49:15 +13:00
e1d8b25e91
- Fix misc champs bugs
2015-10-13 01:24:57 -04:00
f5b80c941c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-13 11:58:27 +11:00
e8388437b6
botspam now checks for chat as well
2015-10-13 11:58:14 +11:00
0bd026f506
- Fixed merge issues
2015-10-12 18:04:35 -04:00
f497eab633
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-10-12 17:54:11 -04:00
bbb863ba92
- Merge conflict patch
2015-10-12 02:36:10 -04:00
2b9a66e7b2
more ssm update
2015-10-12 16:32:23 +11:00
1aecc9505c
Add region to titan, new MOTD
2015-10-12 01:30:31 -04:00
bef942f6da
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-12 00:47:56 -04:00
6a173073a4
added flag to projectiles
...
work on cow kit
2015-10-12 14:39:14 +11:00
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
2abf3edad4
Made items for titanic cosmetics dyes.
2015-10-11 22:29:26 -04:00
b6d573a4d5
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-11 22:25:25 -04:00
7a4ccdf680
Bug fixes
2015-10-11 22:17:34 -04:00
Keir
NewGarbo
libraryaddict
Shaun Bennett
xGamingDudex
Cheese
Jonathan Williams
fooify
Shaun Bennett
AlexTheCoder
William Burns
libraryaddict
Mysticate