58ed9e586c
turned ClansTips into it's own miniplugin, as it doesn't fit as a subclass of Tutorial
2015-11-23 09:04:30 +00:00
875b87e0e4
Fixed memory leak crashing servers.
2015-11-23 02:41:38 -06:00
47abbfbedf
implemented skip tutorial being permanent
2015-11-22 20:01:54 +00:00
19803a00ab
Added the Wither Assault fixes to it's own Branch
2015-11-22 19:06:24 +01:00
2e047b54c2
removed stone weapons from loot
2015-11-22 11:54:38 +00:00
0cdee95b87
formatted some classes
2015-11-22 11:23:19 +00:00
cfeafff2f6
EntityDismountEvent stuff
2015-11-22 14:44:32 +13:00
3bb11bba08
- Fixed Stats [caused by bad communication between chiss and I]
2015-11-21 11:30:53 -05:00
91e40d0e61
hide testing server MOTD
2015-11-21 13:37:19 +11:00
9ef99cee20
fixed merge issues
2015-11-21 11:21:54 +11: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
87a30513de
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-21 11:08:23 +11:00
4a0cc79abf
fixed silence not working in non-champs servers
2015-11-21 11:08:09 +11:00
8b480cc32b
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-20 18:40:42 -05:00
1274dc860d
- Stuff for chiss
2015-11-20 18:40:20 -05:00
2f91ca5a8a
fixed errors
2015-11-21 10:35:17 +11:00
4a70e4da90
more fixies
2015-11-21 10:34:08 +11:00
4d128d9c7a
fixed some skills and wierd hitbox error
2015-11-21 10:29:48 +11:00
c7297a7a38
fixed invalid proxies exploding
2015-11-21 09:45:01 +11:00
d5076b1c47
CTF fix
2015-11-21 09:41:02 +11:00
e0885feea6
Merge branch 'master' into alex-ctf
2015-11-21 09:40:07 +11:00
04be896ff6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-21 09:39:50 +11:00
0bc64fec16
Proxy limit fixes
2015-11-21 09:28:15 +11:00
17e62f1f5a
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-20 18:31:37 +00:00
fb04fac0f6
removed debug message
2015-11-20 18:31:14 +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
521aa8d965
fixed furnaces in undead camp
2015-11-20 09:14:57 +00:00
08f683aa98
gave Archers in undead camps the barbed arrows effect
2015-11-20 07:49:28 +00:00
700e4c9a1f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-19 22:12:08 -06:00
411d6fdb22
Made PlayerTracker use existing code for determining region.
2015-11-19 22:11:45 -06:00
e14f5a36bd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-20 08:34:19 +11:00
f33eedf36d
text fix
2015-11-20 08:33:51 +11:00
c29fd242ca
Forgot to remove the unnecessary check
2015-11-19 14:46:01 -05:00
f47a61e38e
Use bounds for energy tracker messages aren't displayed multiple times
2015-11-19 14:44:03 -05:00
63e580404c
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
2015-11-19 14:36:08 -05:00
3820035762
Cleaning up duplicate code/small optimizations (untested)
2015-11-19 14:35:59 -05:00
b0c60fd1f4
sparkly rare items! woo. and fixed gold dropping waaayyy too much
2015-11-19 19:03:51 +00:00
7d8e1b517d
Fixed dropped gold stacking...
2015-11-19 08:56:07 +00:00
f262a22913
Fixed loot dropping in King of the Hill not dropping correct items/
2015-11-19 08:54:59 +00:00
6372dfd629
fixed ArithmeticException / 0 in ClansEnergyTracker.
2015-11-19 08:29:50 +00:00
0a667afeb1
finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching
2015-11-18 22:27:01 +00:00
4620a5a162
Hub fix
2015-11-18 21:47:52 +00:00
eded09b1a9
fixed yet another bug with beds... argh it seems to be working fine now.
2015-11-18 21:02:39 +00:00
6f3693f804
more bug fixes
2015-11-18 19:32:20 +00:00
924504ac9f
fixed clans home NPE. also added GRASS to UtilItem's item property system.
2015-11-18 19:03:44 +00:00
6fa2a58f5d
Merge branches 'master' and 'william-global' of ssh://184.154.0.242:25565/min/mineplex into william-global
2015-11-18 18:50:09 +00:00
0e1c72e25d
testing excludes
2015-11-18 18:46:51 +00:00
16eecdd112
fixed clan energy alerts going off incorrectly
2015-11-18 17:30:45 +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
5c383a1df3
cleaned up /sethome old bed removal, as previous way would delete any beds around the home bed, which would destroy
2015-11-18 12:24:28 +00:00
9eaffc8acf
Added methods into UtilBlock to place beds and doors. updated /sethome to use the new method for placing beds. i'm sure they'll come in handy later on.
2015-11-18 12:17:00 +00:00
cd0ce57691
replaced useless looping with just checking the rotation of the bed.
2015-11-18 09:58:06 +00:00
1ea87b8354
Fixed an NPE when destroying a Clan's Home
2015-11-18 09:37:32 +00:00
03764ad480
removed the disallowing of interaction in ClansGame.java if the block that the player is hitting, is a Clan's Home. This was messing up the other code for Clan Home bed stuff.
2015-11-18 08:40:24 +00:00
f5e12e5014
formatted ClansGame.java (separate commit because confusion otherwise)
2015-11-18 08:37:34 +00:00
77f234e5f5
Made energy warnings stay for longer
2015-11-18 08:32:48 +00:00
185f19fb6a
fixed clan energy warnings being sent to all players on the server instead of the clan.
2015-11-18 08:13:13 +00:00
6da628abe1
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-18 07:40:35 +00:00
f79c282225
Clan energy warnings implemented. (not tested yet)
2015-11-18 07:39:00 +00:00
4f63d90bac
Only show player location for allies/self
2015-11-17 18:42:06 -05:00
01a57dde2f
Fix formatting of ally messages
2015-11-17 18:39:15 -05:00
52c55335fa
Add chunk to unclaim map
2015-11-17 18:33:21 -05:00
ab8f9cb992
Fix map color
2015-11-17 18:31:38 -05:00
4183f0ce07
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
2015-11-17 18:05:17 -05:00
f6cfc36e9f
War Invasion, GUI Improvements, New ClanRelation for Winning/Losing War, Update Clan Map for new relation, Show invasions in scoreboard
2015-11-17 17:59:35 -05:00
c23b2f54f5
Removed arbitrary boundary around admin territories (Chiss' request)
2015-11-17 22:41:51 +00:00
9b866145ea
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-17 22:24:58 +00:00
31906b025f
Clans Home switched over to using physical beds.
...
Changed "You cannot [break/place/use] [blocks/items] in [territory]" to something more simple (as per Chiss' request)
2015-11-17 22:24:19 +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
0f7c52391f
Global Packet work. Added giveitem sub-command.
2015-11-17 08:19:36 +00:00
6187b5e680
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-16 17:34:47 -05:00
c3cd0e3ad2
Fix chat formatting, open clan shop with /c
2015-11-16 17:31:24 -05:00
f95bec0f15
Fix up mapmanager, untested
2015-11-17 11:30:04 +13:00
a153ffdc38
Fix enchant tables opening the wrong gui
2015-11-16 17:29:25 -05:00
5b30cfb67e
Fix War Points bug
2015-11-16 17:27:56 -05: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
007d5a00dc
Merge remote-tracking branch 'origin/master'
2015-11-16 16:39:43 -05:00
e35eec4cb1
Update motdmanager and compiler.xml
2015-11-16 16:39:34 -05:00
208d90c4bc
Fixed getTargetBlock being 0 when its infinite
2015-11-17 10:18:42 +13:00
0d372cefaa
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-16 19:41:46 +00:00
181642e200
give undead warriors stone swords.
2015-11-16 19:41:09 +00:00
07f92d2e6e
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
2015-11-16 14:39:47 -05:00
2627aa9933
War/War Points Update
2015-11-16 14:37:32 -05:00
88dbe261db
Added logging for stacker.
2015-11-15 18:34:35 -06: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
e5b376bc5c
Fixed wrong CB
2015-11-16 12:48:26 +13:00
667edc8a90
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-15 17:48:16 -05:00
ecaa4a49b4
- Fix for stats
2015-11-15 17:48:00 -05:00
580ec27738
hmm getTitle() in FieldBlock returns null (presumably accidentally), and forgot to update getters with interfaces.
2015-11-15 21:03:48 +00:00
c6f73d6e9a
oh deary me, i appear to have gone on a rampage of changing everything to interfaces.
2015-11-15 21:01:27 +00: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
fff248ad86
king of the hill gold drop fix
2015-11-15 20:37:37 +00:00
5209cf3d38
fixed an annoying IllegalArgument with the World Event start command. fixed limit bukkit runnable not limiting itself.
2015-11-15 20:04:44 +00:00
10eb1bb9c9
enum change didn't commit in the last commit ugh
2015-11-15 19:57:16 +00:00
22ae67ba81
king of the hill changes. (renamed enum for it for ease of typing)
2015-11-15 19:57:00 +00:00
c247fe9317
World event prettification and fixes
2015-11-15 18:19:28 +00:00
aaf3705cc7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-16 06:57:09 +13:00
6e55074211
Add entitydismountevent
2015-11-16 06:56:39 +13:00
2aa7dd13c3
fixed NullPointerException
2015-11-15 15:05:18 +00:00
1d8366487b
Fixed King of the Hill from not working at all, and some other tiny fixes
2015-11-15 14:33:29 +00:00
33d358ac6a
Quick fix in EventTerrainFinder because of incorrect block checking.
...
Added a constant "GOLD_PER_TICK" in the King of the Hill code, because hardcoded numbers are no fun.
Commented out some strange useless code.
Renamed getTicks() to getTicksRunning() and _ticks to _ticksRunning.
2015-11-15 12:09:31 +00:00
e28059848c
New 1.7 leaves fix for UtilBlock#getHighest()
2015-11-15 08:51:59 +00:00
1398987ff7
Removed currently unused world event types.
2015-11-15 08:49:44 +00:00
321d840cfd
Throwing RuntimeException instead of legacy assert expression.
2015-11-15 08:28:57 +00:00
f90b137ccd
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-14 16:46:03 -05:00
e4981c7491
Undead camp finishing stuff
2015-11-14 20:30:37 +00:00
daee44d262
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-14 02:01:24 -06:00
9f37e3e595
Merge remote-tracking branch 'origin/master'
2015-11-14 01:46:44 -05:00
2bb82da735
Motd update
2015-11-14 01:45:55 -05:00
4a73bce586
Added gadget and projectileUser logging.
2015-11-14 00:36:34 -06:00
487f974951
Clan Gui updates and code cleanup
2015-11-13 23:53:34 -05:00
e7b86b4462
hub skytext
2015-11-14 13:05:11 +11:00
60a6a81587
faster cleanup
2015-11-14 13:03:41 +11:00
9518b64e3c
clean up snowballs
2015-11-14 12:55:43 +11:00
259397b6ae
READY 2 GO
2015-11-14 12:52:14 +11:00
770e2be44b
Merge branch 'master' into alex-ctf
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
2015-11-14 11:07:44 +11:00
5586132429
champions balance
2015-11-14 11:05:51 +11:00
8a972075da
Formatted WorldEventManager (seperate commit for formatting so that confusion doesn't arise in future commits)
2015-11-13 21:19:50 +00:00
a0ac15dec5
Allowed Jr.Devs to start/clear world events.
2015-11-13 21:01:09 +00:00
98be3a51a0
Added a Speed I effect to the UndeadWarrior and UndeadArcher creatures that spawn in the UndeadCamp world event.
2015-11-13 21:00:08 +00:00
010f30f064
Made the alpha login message only send one (forgot to save the task manager stuff)
2015-11-13 20:57:33 +00:00
8ba9a8f6c4
Fix border radius
2015-11-12 22:38:26 -05:00
40138b6914
1.8 fix
2015-11-12 22:35:56 -05:00
f3e94cc035
Map fix (probably broken?!)
2015-11-12 21:35:01 -05:00
016e54977d
- Finish game [FINALLY]
2015-11-12 21:16:58 -05:00
9de3981dec
ms update
2015-11-13 11:24:11 +11: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
c4e188296a
Fix compiler and misc
2015-11-12 17:55:00 -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
875c399c9f
Merge branch 'master' into clans-beta
2015-11-11 21:31:03 -05:00
33680e829a
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-11 21:25:32 -05:00
25f299b490
Fix interact types
2015-11-12 14:34:12 +13:00
e66bebcfb1
Give all treaure items when opening the chest
2015-11-11 18:13:47 -05:00
994a9e3e43
Clans Gui Work, commiting so I can switch branches
2015-11-11 18:05:48 -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
ba7515f761
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-12 04:27:17 +13:00
b915131407
Fix some armorstands and interaction bugs
2015-11-12 04:26:55 +13:00
27ef2c0bbb
Fixed UtilEnt.Leash method.
2015-11-11 04:36:10 -06:00
0e6146d5c9
Added expire to Stacker throw.
2015-11-11 04:32:56 -06:00
3ed680e1c2
ms update
2015-11-11 15:55:48 +11: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
4dd9b0967a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-11 12:50:07 +11:00
a47752cfe2
disabled usage of /minecraft: commands in 1..8
2015-11-11 12:49:19 +11:00
d971e3c8a3
ms update
2015-11-11 12:46:58 +11:00
ee286c2676
Disable /minecraft commands
2015-11-11 13:49:06 +13:00
7559d1feb5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-11 11:45:40 +13:00
f18c55cbd9
Fix schedulers
2015-11-11 11:45:17 +13:00
e3c22b356b
Merge branch 'master' into minestrike-update
2015-11-11 07:54:28 +11:00
4eaa165826
such format
2015-11-11 07:54:13 +11: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
b3125e40ff
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-11 07:43:01 +11:00
6983af944f
Fix a craftbukkit bug
2015-11-11 00:25:20 +13:00
37fdf53a51
Fixed champion's Illusion crash
2015-11-11 00:21:28 +13:00
d654f1f4b1
- Fixed class edit in lobbies
...
- Fixed conflict between rave suit and assassin
2015-11-10 06:17:25 -05:00
1a2c163ce2
Fix scoreboard out of bounds error
2015-11-11 00:03:08 +13: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
6e90052480
Updated StaffServer to 1.8
2015-11-10 02:01:39 -06:00
0a9c97c32a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-10 18:05:01 +11:00
2707173a8b
Merge with 1.8 Branch
2015-11-10 01:48:33 -05:00
83248a8fec
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-10 09:11:27 +11:00
0ae5330634
squid changes
2015-11-10 09:11:10 +11:00
1aef7fe0b9
bunch of fixes reported by qa in tutorials.
2015-11-09 20:46:38 +00:00
f1fbe086d3
oh how fun, even more constructor errors!
2015-11-09 20:29:52 +00:00
af6e28f14b
don't you worry Shaun, I gotcha back with fixing them constructor problems ;)
2015-11-09 20:29:27 +00:00
c6ff845efa
arcade weird thingy
2015-11-09 20:28:41 +00:00
8850737f71
Fix constructor issues
2015-11-09 15:22:15 -05:00
0bb3f8adb1
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
# Conflicts:
# Plugins/.idea/dataSources.xml
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2015-11-09 14:41:16 -05:00
610b5dbeb2
More work on gui
2015-11-09 14:39:52 -05:00
5c89124eb6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-09 03:25:02 -06:00
ba7d5bbcdc
Fixed Arcade!
2015-11-09 03:24:20 -06: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
0409d7ffef
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-09 08:48:12 +00:00
4232a5675f
fixed bug with part 5 of the getting started tutorial (has to do with claiming events)
2015-11-09 08:45:34 +00:00
8f507c4b9c
typo
2015-11-09 08:29:51 +00: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
2a7b272de3
Merge remote-tracking branch 'origin/master'
2015-11-09 01:55:36 -05: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
ff936784d3
Remove debug code.
2015-11-08 17:27:00 -06:00
e86623c8d0
Disabled TrickOrTreatManager to test for Lobby lockups.
2015-11-08 17:26:43 -06:00
fd3ccf7ce0
Fix Bungee lobby balancer code.
2015-11-08 17:25:54 -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
1999e09e69
Update CB
2015-11-09 02:44:16 +13:00
ce3af6cf9c
Update cb.jar
2015-11-09 00:15:28 +13:00
9e24a5005f
- Completed CTF
2015-11-08 03:04:17 -05:00
211298327f
- Fixed banners, begun work on patterns
2015-11-08 02:42:31 -05: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
fb7fcccf24
- Reverting back to banners
2015-11-08 01:01:18 -05:00
e039f2249c
Update cb
2015-11-08 18:02:36 +13: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
3c82574386
Testing pushing/ignore this
2015-11-07 20:02:07 -05:00
ffc389f9c7
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-07 19:58:12 -05:00
af1d91913b
Clans gui work
2015-11-07 19:58:03 -05:00
cc2e5bc6e4
minestrike update!
2015-11-08 11:30:19 +11:00
9a70d33b17
Fixed clans user directory being wrong on test servers (because a backslash ['\'] is not seperator for certain OS). Changed /gear command rank back to Admin, and added assassin armor to the gear GUI.
2015-11-07 20:26:43 +00: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
627ce08113
Add info on note particle
2015-11-07 21:35:26 +13:00
e1f56a5d5a
Merge remote-tracking branch 'origin/master'
2015-11-07 01:10:34 -05:00
ec7600a4a2
Giveaway tweaks
2015-11-07 01:10:27 -05:00
c922c3248c
disabled trick or treat
2015-11-07 13:36:16 +11:00
f4bf685e96
removed halloween hub
...
removed titan giveaway and pumpkins
2015-11-07 13:20:29 +11: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
d3d448ccfe
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-11-07 04:47:37 +13: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
7675b00999
Dominance event. Shaun will have to call the new events once he's done with Dominance.
2015-11-06 07:11:06 +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
1375623625
Added alpha messages.
2015-11-04 17:03:52 +00:00
77125b3a24
Don't re-set scoreboard lines
2015-11-05 01:10:08 +13:00
31b4fbec15
Fix a null
2015-11-05 00:49:26 +13:00
0352e52a68
Tentative beginnings of wider scoreboards
2015-11-05 00:42:45 +13:00
3ff044fddb
Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips
2015-11-04 11:32:06 +00:00
a0676b7bcf
Fix tnt in SG being usable during DM invul
2015-11-04 21:44:10 +13:00
21d10e4bec
Fix typo
2015-11-04 19:15:06 +13:00
b3f86ba638
Fixing bugs
2015-11-04 18:34:22 +13:00
8033b40011
made math in GearPage a tiny bit more understandable
2015-11-04 01:27:33 +00:00
ed1e394a84
removed an unused type and a bit more cleanup; getting ready to clean up GearPage, which is... *shudders*
2015-11-04 00:09:46 +00:00
a455804dce
some Tutorial code cleanup
2015-11-04 00:07:32 +00:00
4bf92ce0a0
gah why isn't this working?! git is annoying!!!
2015-11-03 23:47:35 +00: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
b7bf4765c4
DANG YOU WILLIAM
2015-11-03 22:05:17 +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
c25b1969de
More progress
2015-11-04 04:00:53 +13:00
f66c85d5b0
When clearing or getting items from player inventory, get it from player crafting as well
2015-11-03 18:57:41 +13:00
c518221f6b
- Fix Merge Error
2015-11-02 22:14:48 -05:00
c41d01e213
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-bugfixes
...
Conflicts:
Plugins/Mineplex.StaffServer/.classpath
2015-11-02 22:09:18 -05:00
89c9f19c69
- Fixed MPS Whitelist
2015-11-02 22:08:02 -05:00
975ad9e6ea
Update to master
2015-11-03 15:05:56 +13: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
7496ed763a
Fix wither and dead bodies bug
2015-11-03 14:41:34 +13:00
4794cc6924
Clans Gui
2015-11-02 20:41:08 -05:00
3f66e11b3d
Add fence to non-full-solids
2015-11-03 12:39:13 +13: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
27c6ef4e9d
Success! Finished all events woohoo!
2015-11-02 10:16:13 +00:00
0bc8413430
test
2015-11-02 10:11:54 +00:00
74c0eac141
Bunch of fixes and new stuff:
...
Cleaned up code everywhere.
Added a ClanCreatedEvent (accidentally formatted ClansDataAccessLayer ooooops)
Removed the tutorialManager access from ClansManager, as it is unneeded now.
Added Lapis Lazuli block particles to Alligator's Tooth (Sammy's request.)
Fixed NPE in TutorialTask#onFinish(Player);
2015-11-02 08:04:38 +00:00
55d028d706
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-01 22:09:58 -06:00
3a0b8d75a2
Added new support member.
2015-11-01 22:09:50 -06:00
18bdcbec62
Fixed some NPEs with TrickDialogue
...
Added debug messages for Tricks.
Cleanup of monster targets in HubManager.
2015-11-01 22:09:36 -06:00
9cf62cfe7f
Don't use player skulls until caching is setup and working properly
2015-11-01 22:58:22 -05:00
cdb0fcae75
modified hideme a little :)
2015-11-02 14:37:12 +11:00
da6bf27c77
Staff with a higher rank can see lower rank and same ranked vanished staff.
2015-11-02 04:32:07 +01:00
cb96124feb
Added extra cleanup for FriendsGUI and AddFriendPage
2015-11-01 17:42:23 -06: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
5c2ade8270
Updated staff list.
2015-10-31 14:55:34 -05:00
f16eee220d
Removed Debug messages.
2015-10-31 14:55:18 -05:00
073321fb14
Refactored TrickOrTreat Stuff.
2015-10-31 14:45:42 -05:00
92a2c2ebaa
fixed npe in kit npc creation
2015-10-31 19:55:58 +11: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
5d58c56c27
fixed kit bug
2015-10-31 18:31:13 +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
71e49854db
Add halloween hats
2015-10-31 02:10:15 -04:00
1a6617bce1
Changes.
2015-10-31 02:05:03 -04:00
519dceb72e
Doublejumping downwards is a no no
2015-10-31 19:02:58 +13: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
878f7aeafd
Potentially fixed the problem where your NPC skeleton sticks around after you log in, and attacks you.
2015-10-30 22:48:40 +00:00
f54da4ee78
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-10-30 22:20:33 +00:00
396ce75087
Bug fixes/Additions:
...
- Being able to kill clan mates/create mode players who combat log.
- Added a notice that the player was killed, when a player logs back in after being killed when combat logging.
- Fixed Fall Damage making a player unsafe in safe territories.
- Fixed Alligator's Tooth damage.
- Fixed Alligator's Tooth working in lava.
- Added a UtilFile to Mineplex.Core.Common, for all stuff files!
2015-10-30 22:13:19 +00: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
da0a99d662
Spawn facing fixes
2015-10-30 16:06:47 +13:00
50edf557ab
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-10-30 15:57:36 +13:00
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
c4e93180fa
Merge branch 'master' into smash-champs-balance
2015-10-30 13:00:30 +11:00
0be51d5629
- Even more bugfixes
2015-10-29 16:48:51 -04:00
401350e85d
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-10-29 13:14:33 -04:00
364d8b05af
Fix war invasion
2015-10-29 13:14:27 -04:00
e2947718fe
Remove code that wasnt meant to be commited
2015-10-29 13:10:10 -04:00
66a4b148e1
Fixed put on armour task being inconsistent.
2015-10-29 13:44:11 +00:00
0c5e34ad84
Finished the tutorial changes that I wanted to add. Added a few more events for shop stuff, to make the code a bit cleaner. Might continue the idea of more events in Clans. Added an optional argument to QAResetCommand which will allow you to reset to a specific task number. Quite useful when testing tasks that are one of the last ones!
2015-10-29 12:56:00 +00:00
7fca42b0e0
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/turfforts/TurfForts.java
2015-10-29 21:41:59 +13:00
14df456b3d
Progres
2015-10-29 21:39:38 +13:00
d0bfb2e2e9
Finishing touches with UtilItem. Lots of changes to tutorials, and added a PlayerEnterTerritory event.
2015-10-29 08:35:24 +00:00
acc915c34e
Re-added my TurfForts patch, as well as fixed the "Game Changes to build time while spectating so you don't get your blocks" glitch.
2015-10-29 01:12:12 -04:00
8dd80094b4
Fixed a little boolean derp that stopped people from breaking blocks.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 1f0accd
2015-10-28 23:26:18 -04:00
9df297fc11
Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 76e4dc6
2015-10-28 23:25:56 -04:00
a063da4cae
Renamed some things to comply with standards. Also moved some of the bit flags around, and moved them into seperate parts.
2015-10-28 22:55:10 +00:00
afadd61431
Added a few new item categories into UtilItem, and added the bitmasks to the materials belonging to said categories. Changed from using the 32bit int data type, to using the 64bit long data type, this should give me a bit more free space for more categories to put items in to, as I already ran out of space using a regular int.
2015-10-28 22:47:30 +00:00
cf26541461
- More Bugfixes
2015-10-28 18:16:52 -04:00
cffcf245e9
UtilItem.java overhaul, complete item attribute system added.
2015-10-28 22:14:08 +00:00
8ce50d1fc7
Done most of the tutorial ghost mechanic, and also switched from using task's indexes for referencing the tasks, instead using names now. This should allow for much more flexibility, and adding/removing tasks will not be such a pain! (Having to switch all of the task indexes around for any code referencing tasks.)
2015-10-28 17:08:48 +00:00
765fb4ce11
Created the ClansShopItem enumeration, which has every item that can be sold in shops, with their buy and sell prices. All shops have been updated to reference this enumeration to get the prices for items.
...
Made it so that players that are "weaklings" will be stripped of their weakling title, if the sell value of their inventory is greater than 2000 Gold.
This mechanic uses the ClansShopItem enumeration, and is the main reason why it was created, since all prices were normally hardcoded into the shop page classes.
2015-10-28 07:34:13 +00: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
8d5b6e6d90
Don't show weakling particles above players that are not alive. Also removed debug message.
2015-10-27 10:18:14 +00:00
1938bcf799
Fixed the "weakling" status not updating correctly.
2015-10-27 10:01:33 +00:00
b4897e91fa
Fixed bug where an NPC's hologram would still stick around after the NPC is killed, since death and regular removal over time are handled separately.
2015-10-27 08:56:41 +00:00
234799e55e
Fixed infinite recursion in AlligatorsTooth.
...
Fixed a NullPointer exception in the Gear UI when you don't select an item type and you continue on.
Made a way to visually see the task you are on in the getting started tutorial, by making it dark cyan.
2015-10-27 08:32:21 +00:00
0ab3213b7b
- Fixed permanent dwarf toss bug
...
- Fixed skills being active while player is editing class
2015-10-27 01:38:41 -04:00
9d6a361602
- Fixed emerald jump for Relyh
2015-10-26 23:42:52 -04:00
c30ece9d8b
Improved SafeLog to use the title system and holograms! Also removed knockback for NPCS
2015-10-26 19:48:20 +00:00
da058881f8
Some bug fixes in the gear ui, added the shine to rare item factory (I FORGOT TO COMMIT THE CLASS LAST COMMIT ARGH)
...
added alligators tooth particles & sound
added wind blade power feature
2015-10-26 15:37:44 +00:00
eb350a79c3
Added RareItemFactory (will add shine when lib helps me with it) and other small little fixes. Added a way to specify the amount of items in a single line in GearPage, so that armor and weapon type listings look more aesthetically pleasing.
2015-10-26 12:21:33 +00:00
7770fa0284
- Added system to ensure banned players are removed from the network
2015-10-26 07:09:01 -04:00
63406e9ce1
Moved GearManager back to it's original package, and stopped using it in GearPage. Removed commented code from GearCommand, as the gui is now finished and it is not needed anymore.
2015-10-26 07:57:00 +00:00
7eab57c5dd
As per Chiss' request, made the gear ui go to next page when you choose an attribute.
2015-10-26 07:49:03 +00:00
f5b4f28848
- Fixed achievements
...
- Various balance patches/audio changes
2015-10-26 00:25:33 -04:00
cc2aae9726
Final touches to the gear gui, making it now completely finished. hooray!
2015-10-26 00:08:03 +00:00
327c129f46
Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}])
2015-10-25 12:28:12 +00:00
57da1d195a
- Resolved randomly using java 8 in this one plugin
2015-10-24 20:50:47 -04:00
08fd1b5790
- Fixed MPS Whitelist for usernames with non-lowercase characters
2015-10-24 20:49:09 -04: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
63bc492f2c
Almost completely finished the /gear ui, still a few bugs and missing features, but it's getting there. Logging off now, don't want to lose code.
2015-10-24 20:36:53 +01:00
0d56eefd44
Titan/Rewards adjustments
2015-10-24 13:40:17 -04:00
089c4420b2
Lots of progress towards a /gear gui, not finished though. commiting now because I'm leaving and don't want to lose the code.
2015-10-24 07:16:13 +01:00
e3c824c512
Fix minor skywars error
2015-10-24 13:32:55 +13:00
4d2b359aad
Fix wolf cub strike
2015-10-24 08:41:10 +13:00
43cd0f86a9
Fix players unable to break blocks at spawn
2015-10-24 08:40:57 +13:00
7f025ad029
Fix CustomExplosion
2015-10-24 08:40:43 +13:00
40afcaf26b
Global Packet Commands
2015-10-23 15:07:53 -04:00
0c29805756
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-10-23 19:27:13 +01:00
NewGarbo
Jonathan Williams
Morten
libraryaddict
AlexTheCoder
Cheese
Shaun Bennett
William Burns
Shaun Bennett
libraryaddict
Keir
Sarah
Aaron Brock