9dcc048953
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 04:23:14 +00:00
6119500b68
changes
2015-11-27 04:23:02 +00:00
faaa1fcf0b
Use castle clan icon for /c <clan>
2015-11-26 23:15:14 -05:00
5744178286
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 04:06:02 +00:00
dbda29e3f3
magnetic maul fixes
2015-11-27 04:05:47 +00:00
73f4450fa3
clans fixes
2015-11-27 04:04:29 +00:00
ef511f1704
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 22:38:03 -05:00
6da10950da
Update clan icons, fix client class
2015-11-26 22:37:54 -05:00
0274bf2847
loads of changes.
2015-11-27 03:28:19 +00:00
3c98243201
Some more guardian stuff
2015-11-27 15:56:56 +13:00
0a4416381b
Fix guardian
2015-11-27 15:55:02 +13:00
98d988584d
titan cosmetics
2015-11-27 13:35:25 +11:00
e849484670
bunch of changes and fixes and bugs and stuff and things
2015-11-26 23:59:47 +00:00
055702b36e
changes and fixes and woo
2015-11-26 23:08:33 +00:00
56d4b34969
fixed formatting on death notices.
...
Made world event middle texts longer lasting.
Fixed logout NPC timer
2015-11-26 21:57:26 +00:00
5393d1d18c
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-26 21:16:21 +00:00
6e416b1059
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
2015-11-26 16:12:54 -05:00
27e214a643
Region fix
2015-11-26 16:12:29 -05:00
dd33d9587d
made power recharge a tad faster with Wind Blade
2015-11-26 21:12:09 +00:00
0aaee24600
fixed gear UI display stuff incorrectly
2015-11-26 21:06:33 +00:00
bb3ea0115d
fixed classes not loading
2015-11-26 20:41:42 +00:00
67a28a94fb
bunch of fixes
2015-11-26 20:32:01 +00:00
2bce722539
some code polishing. fixed some mispositioning with Spawn holograms.
2015-11-26 13:29:40 +00:00
e5fa59b8da
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-26 13:17:28 +00:00
009ddaaee1
stop players in tutorial from receiving/sending chat.
2015-11-26 13:16:50 +00:00
bbfd319bcd
Spawn holograms
2015-11-26 13:14:10 +00:00
1ce2a362c6
disallow item frames being rotated in Spawn
2015-11-26 12:34:12 +00:00
be19c17fee
fixed gem -> gold conversion rate
2015-11-26 12:33:29 +00:00
9aaad0b4a1
fixed formatting in /spawn command
2015-11-26 12:31:55 +00:00
bdc08676d9
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
2015-11-26 03:34:33 -05:00
d4f3786b1c
Fixes
2015-11-26 03:31:03 -05:00
94a0f3244d
corrected typo in WindBlade.java
2015-11-26 07:53:37 +00:00
af0df835b8
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
2015-11-26 07:52:35 +00:00
97e903f403
updated regions
2015-11-26 07:51:10 +00:00
75ff5bb3da
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 02:46:56 -05:00
56d5c10481
oops util ent new method didn't commit in last commit
2015-11-26 07:29:59 +00:00
c0cfdf9785
fixed windblade not recharging whilst jumping
2015-11-26 07:29:39 +00:00
e80c1097b5
corrected regions
2015-11-26 07:08:30 +00:00
0d43ffc7b2
fixessss
2015-11-26 06:54:49 +00:00
6de7b8a73e
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 01:46:43 -05:00
972a2d151a
simplified combat log npc title
2015-11-26 06:21:01 +00:00
f92849f796
that doesn't do what i thought it did
2015-11-26 05:32:59 +00:00
1e4b6b4d0f
fixed formatting error in clan tip
2015-11-26 05:30:13 +00:00
7da8b8e3bf
fix players hurting each other in safe zones
2015-11-26 05:29:35 +00:00
48ebfc219d
removed travel npcs from shops
2015-11-26 05:24:33 +00:00
389956240b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 00:20:41 -05:00
76d009e0de
Unstuck (Spawn) command
2015-11-26 05:18:18 +00:00
33cdd5400d
fixed some coloring issues
2015-11-26 04:32:41 +00:00
193c5fe487
fixed static
2015-11-26 15:26:57 +11:00
8f14c8beae
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
2015-11-25 23:26:29 -05:00
7a663b4f7b
Fix legendaries
2015-11-25 23:24:07 -05:00
8bd1f4b3c8
reduced hyper axe damage. OP as heck
2015-11-26 04:21:30 +00:00
abcee009dd
stuff
2015-11-26 04:07:33 +00:00
059a9a32cd
fixed method
2015-11-26 14:51:45 +11:00
83a7b398bc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-26 14:47:24 +11:00
1a5dbc073d
recursive block find method
2015-11-26 14:47:01 +11:00
670afc17ef
clans chat is being weird
2015-11-26 03:26:15 +00:00
5230b25dfd
fixed suicide command (?)
2015-11-26 03:24:48 +00:00
4f275d79fa
fixed staff tags only displaying if player is in clan
2015-11-26 03:19:40 +00:00
5fb58b1dad
added suicide command
2015-11-26 03:17:05 +00:00
8a64a2f4ce
fixed world events spawning floating on grass and other boundless blocks
2015-11-26 03:06:27 +00:00
b43cf0b28a
got rid of enchanted effect on rare items
2015-11-26 03:00:59 +00:00
55ff04ca93
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-26 15:49:54 +13: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
7e23f896ca
changes
2015-11-26 02:49:01 +00:00
55f5f95869
added no ammo display
2015-11-26 13:05:27 +11:00
65a1441e1f
-Fixed smoke being removed when bomb was planted in it
...
-Fixed being unable to defuse bomb in smoke
-Fixed older smokes removing newer intersecting smokes
-Grenades will still detonate after being burned
-Bizon now gives $600 per kill
-Added replacement smoke on gun fire
-Added shell ejecting particles on gun fire
-Removed gun bobbing when firing
-Changed ammo display location
2015-11-26 12:56:26 +11:00
a19ade0739
rain rain go away
2015-11-26 00:53:01 +00:00
11deec75dd
fixed illusion
2015-11-26 00:44:13 +00:00
c150ea6175
Potatoes and Tornadoes
2015-11-25 19:08:13 -05:00
cc75bafb4c
Bugs and thugs
2015-11-25 16:45:04 -05: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
c5211e0368
buuugs
2015-11-25 17:40:12 +00:00
9a8fba543d
auto-replanting trees
2015-11-25 17:03:48 +00: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
84fde1c087
Fixed double jump and entity ground tool.
...
Fixed isGrounded so that it doesn't return false positives when too
close to a wall.
Added 500ms recharge to double jump, preventing instant recharge
allowing players to jump twice before having to touch the ground again.
2015-11-25 16:42:32 +01: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
360f3db2ed
fixed grenade vertical rebound bug
2015-11-25 17:48:32 +11:00
8ceb6ccfca
minestrike update!
2015-11-25 17:41:00 +11:00
7e9dc7968e
gear gui fixes and legendaries changes
2015-11-25 01:32:05 +00:00
bbdbb209c5
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-25 00:55:37 +00:00
3a6dab7224
stuff
2015-11-25 00:55:11 +00:00
3cb22c8cb7
uuid bug fixed finally!
2015-11-25 00:47:35 +00:00
ecf42803f9
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-11-25 13:42:31 +13:00
ca81265b9e
Readded PacketHandler debug message
2015-11-25 13:42:11 +13:00
aa52c1be27
custom item stuff
2015-11-25 00:14:34 +00:00
6220ce14fe
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-24 23:04:24 +00:00
98edd0a452
dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours
2015-11-24 23:03:19 +00:00
81c2d2a11f
*just pushing my current changes so that i can start fresh on recoding custom item serialization stuff*
2015-11-24 22:49:28 +00:00
31afe9f886
removed debug message from undead camp
2015-11-24 22:29:20 +00:00
57302221df
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-24 17:27:46 -05:00
cb7422b4fe
Re-enable world events
2015-11-24 17:27:35 -05:00
befe4d129d
formatted PlayerGear.java (to avoid further confusion)
2015-11-24 22:21:01 +00:00
459e1beeff
clans buggy fixers
2015-11-24 22:18:48 +00:00
d66bad572f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 22:19:59 +11:00
5799edae50
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-24 23:45:42 +13:00
ddf7528796
Updated CB
2015-11-24 23:45:22 +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
7e2f5f0657
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 21:30:45 +11:00
11a60a86a9
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-24 21:30:17 +11:00
fbea0e702b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 02:56:40 -06:00
c5b5d07627
evade timing
2015-11-24 16:07:11 +11:00
913d079623
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 15:23:53 +11:00
7454cf7443
MS + Champs bugs, balance and more
2015-11-24 15:23:37 +11:00
8559a63887
Added all rank names to Clans name blacklist
2015-11-23 22:10:29 +00:00
3fa0beceb7
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-23 21:39:53 +00:00
ef7c26c04c
Clans changes
2015-11-23 15:57:13 -05:00
91067535db
changed getting started tutorial gold reward to be proper (5000 now)
2015-11-23 18:09:50 +00:00
175a6bc31a
cleaned up world event times stuff
2015-11-23 17:24:17 +00:00
9bae314278
fixed null pointer exception when interacting with a block when your clan home is null
2015-11-23 17:19:00 +00:00
6ca4d12d98
fixed potential nofall exploit with logout npc
2015-11-23 17:09:51 +00:00
ce2e616c74
fixed /skiptutorial bugs, removed safe log out command, fixed tutorial bugs, and much more i can't remember ;-;
2015-11-23 16:57:50 +00:00
da2c7d84a4
tutorial code cleanup. removed qa reset command
2015-11-23 11:19:23 +00: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
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
NewGarbo
Shaun Bennett
libraryaddict
Cheese
Shaun Bennett
xGamingDudex
Jonathan Williams
Morten
AlexTheCoder
William Burns