Merge pull request #283 from peppy/general-fixes

General fixes
2024-12-26 00:32:52 +00:00 · 2017-01-08 21:45:31 +08:00 · 2017-01-08 21:45:31 +08:00 · 97c5a2f970
commit 97c5a2f970
parent d3397e2cfc 651ea1b0d6
3 changed files with 4 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4ce11f434dccb07b35b64618bf3db97c09d310a5
+Subproject commit b84b391c7fed14023ad309f42169909f4151d69b
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e24414a277e407ae2438e4b6d9fa9c7992dd6485
+Subproject commit 30031c02aff374f0c5558f2d732614559301f658
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
@ -42,6 +42,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                    Colour = osuObject.Colour,
                    Hit = () =>
                    {
+                        if (Judgement.Result.HasValue) return false;
+
                        ((PositionalJudgementInfo)Judgement).PositionOffset = Vector2.Zero; //todo: set to correct value
                        UpdateJudgement(true);
                        return true;