Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Core/Script: fix bug that prevent double spending reset cooldown #16287

Merged
merged 1 commit into from Jan 26, 2016

Conversation

GigaDev90
Copy link
Contributor

With this fix, all spells cast 30 second before duel, it will not be restored

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @Vincent-Michael, @ShinDarth and @Rushor to be potential reviewers

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wtf?

@ghost
Copy link

ghost commented Jan 16, 2016

that was annoying, Good Job!

@@ -14,17 +14,18 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this


class DuelResetScript : public PlayerScript
{
public:
DuelResetScript() : PlayerScript("DuelResetScript") { }

typedef std::chrono::system_clock Clock;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should just use SpellHistory::Clock instead of typedefing it here

@FrancescoBorzi FrancescoBorzi self-assigned this Jan 18, 2016
FrancescoBorzi added a commit that referenced this pull request Jan 26, 2016
Core/Script: fix bug that prevent double spending reset cooldown
@FrancescoBorzi FrancescoBorzi merged commit d0e4f28 into TrinityCore:3.3.5 Jan 26, 2016
@GigaDev90 GigaDev90 deleted the fix_bug_duel_abuse branch January 26, 2016 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants