Commit Graph

3260 Commits

Author SHA1 Message Date
xXVevzZXx
bf4de4471a fix permanent item removal and battle items in inventory 2016-06-11 17:33:12 +02:00
xXVevzZXx
bc77605dcd make crafted weapons in SG unbreakable 2016-06-11 16:43:56 +02:00
xXVevzZXx
a461e9cf1c fix inventory being editable while voting phase 2016-06-11 16:27:31 +02:00
xXVevzZXx
75e36d0e08 fix pickup of dropped tnt 2016-06-11 16:13:07 +02:00
xXVevzZXx
5e551a2ba6 fix waller only being able to make two walls 2016-06-11 15:49:31 +02:00
xXVevzZXx
73d8aec494 fix breakable Armor in Wizards 2016-06-11 00:21:04 +02:00
xXVevzZXx
b13b354ce7 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
2016-06-11 00:20:38 +02:00
Shaun Bennett
35e1c2af65 Use rewardCoinsLater for giving shards 2016-06-09 18:19:22 -05:00
xXVevzZXx
f6b60ad956 fix idle manager to persist teleports and make xp rewards depending on playtime 2016-06-09 15:51:27 -05:00
Shaun Bennett
ece08c23a9 Fix merge issues 2016-06-09 00:40:05 -05:00
Shaun Bennett
699b35995f Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2016-06-09 00:39:39 -05:00
Shaun Bennett
d4ac309daa Merge remote-tracking branch 'remotes/origin/master' into feature/gems 2016-06-09 00:29:27 -05:00
Shaun Bennett
83be0d7efe Disable game boosters in arcade 2016-06-09 00:28:48 -05:00
cnr
cf6e3cf05d Merge branch 'feature/game-variants' into develop 2016-06-08 22:47:16 -05:00
Shaun Bennett
c9d5b91c52 Proper booster activation events 2016-06-08 19:22:25 -05:00
xXVevzZXx
ce8c8543f6 fix game class not beeing added to modable classes 2016-06-09 01:11:19 +02:00
xXVevzZXx
b66b459e05 implement xp multiplier 2016-06-08 23:40:48 +02:00
cnr
d54bed150e Merge branch 'mopple' into develop 2016-06-08 12:59:06 -05:00
xXVevzZXx
1aba217c55 slowly increase spider energy 2016-06-08 12:51:07 -05:00
xXVevzZXx
aa1c599b5e Disable particles in DMT, disable Monster Damage in OITQ, fix teleport out minion despawning, horsman description, ice melting in master builders and energy draining for spider leap in SSM 2016-06-08 12:51:07 -05:00
Shaun Bennett
37a412f1bf Starting to merge boosters into arcade code 2016-06-07 17:24:24 -05:00
xXVevzZXx
9e88174c36 slowly increase spider energy 2016-06-07 00:19:56 +02:00
Sam
8066eb939a PC-500
Fixes an issue where players were able to open beacon inventories can
give themselves the buffs from it.
2016-06-06 18:14:06 +01:00
Sam
4b576dbf3c PC-164
Fixes an issue where players would be able to duplicate items in Bridges
2016-06-05 23:03:04 +01:00
Sam
64ff9f193a PC-403
Fixes an issue where if a player was in the respawning state in MCL and
their tower was destroyed they would not receive their gold armor
2016-06-05 15:34:20 +01:00
Sam
05e85523b1 PC-405
Fixes an issue where players would be able to fill buckets of water in
Bridges and get to the centre before the Bridges has fallen.
2016-06-04 17:42:30 +01:00
Sam
78c5b8a0a3 PC-402
Fixes a typo with the BeastMaster kit.
2016-06-04 17:00:09 +01:00
Sam
981943b38b PC-413
Fixes an issue where /vanish could be abused during GameState.Prepare
2016-06-04 00:14:12 +01:00
Sam
f99d4bc14d PC-164
Fixes an issue where players would be able to duplicate kit items by
giving them to another player then using their "Early game revive"
2016-06-03 23:29:46 +01:00
xXVevzZXx
5a5a25a799 make "and" bold 2016-06-03 14:15:46 +02:00
Sam
1ff06adf18 Rewrite of how /vanish is handled in game servers (PC-Bug-413)
Fixes all /vanish based issues where players would be not correctly
handled while toggling /vanish in game servers.
2016-06-03 13:13:19 +01:00
xXVevzZXx
f517954064 edit gem/shard display layout 2016-06-03 14:12:55 +02:00
Sam
ee10751e23 Players could flip trap doors (PC-Bugs-440)
Fixes an issue where players would be able to flip trap doors in Dragon
Escape to either troll players or give them an advantage.
2016-06-02 22:30:18 +01:00
xXVevzZXx
719ac114d8 change text color 2016-06-02 21:19:54 +02:00
xXVevzZXx
231b55d018 add shards depending on rank 2016-06-02 21:13:12 +02:00
xXVevzZXx
aa1ea63337 adding shard reward to games 2016-06-02 20:16:36 +02:00
Sam
eaada4acaf PC-400
Fixes an issue where items could be placed in item frames and then would
not be able to be retrieved.
2016-06-01 23:40:03 +01:00
Sam
6a423b571a PC-379
Fixes an issue where the map selector for Paintball and Snow Fight did
not work in MPS.
2016-06-01 22:40:07 +01:00
Sam
146f878e62 PC-422
Fixes a not well constructed kit description. (Medic)
2016-06-01 22:03:13 +01:00
Sam
d83a6cd95c PC-421
Fixes a typo when a user was reported for an inappropriate build.
"Buildres" to "Builders"
2016-06-01 21:57:34 +01:00
Sam
b08c2c9467 PC-149
Fixes an issue where entities wouldn't be removed when a build got a
"Failure" score.
2016-06-01 15:41:02 +01:00
Sam
4c4363ffaa PC-409 - 2
Not sure why but it missed out an if statement in the previous commit
2016-06-01 14:54:23 +01:00
Sam
df9fe45d7e PC-409
Fixes an issue where the game lobby scoreboard would not account for
players in /vanish.
2016-06-01 14:51:22 +01:00
Sam
1a9f58451b PC-383
Fixes the issue where players would not be able to move when joining a
game in Mine-Strike as the GetSpectatorLocation() method would be
outside the map borders.
2016-05-31 22:35:52 +01:00
Sam
6b70292837 PC-124
Fixes an issue where if a user did /spec pre-game they would not be
given a Spell-Book in game.
2016-05-31 20:04:03 +01:00
Sam
d98afaf829 PC-125
Fixes a small grammatical error where "effect" was used instead of
"affect".
2016-05-31 19:44:29 +01:00
Sam
6a2b43f32d PC-130
Fixes an issue where you could right click the UHC item in the set game
page which would allow you to have a golden apple in game.
2016-05-31 14:15:19 +01:00
Sam
c7757117fc PC-148
Fixes a very trivial issue with Ocelots being named incorrectly
2016-05-31 13:40:20 +01:00
Sam
3bdc541c9d Debug message removal 2016-05-31 11:12:55 +01:00
Sam
6db4c3acc7 PC-203
Fixes the issue of "auto-bowing" in OITQ
2016-05-31 01:46:50 +01:00