From 3cce56f6d2dfd6b54e7841818239cf9c042b6275 Mon Sep 17 00:00:00 2001
From: Ivo Julca <ivojulca@hotmail.com>
Date: Thu, 10 Mar 2016 17:18:53 -0500
Subject: [PATCH] Forcibly replace Object.values implementation from Sugar.js

---
 battle-engine.js  | 2 +-
 team-validator.js | 2 +-
 tools.js          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/battle-engine.js b/battle-engine.js
index f1198c0ab1..ecfa6a06fb 100644
--- a/battle-engine.js
+++ b/battle-engine.js
@@ -13,7 +13,7 @@
 'use strict';
 
 require('sugar-deprecated')(require('./crashlogger.js'));
-require('object.values').shim();
+Object.defineProperty(Object, 'values', {writable: true, configurable: true, value: require('object.values')});
 
 global.Config = require('./config/config.js');
 
diff --git a/team-validator.js b/team-validator.js
index 75754954c8..7381d82d93 100644
--- a/team-validator.js
+++ b/team-validator.js
@@ -925,7 +925,7 @@ if (!process.send) {
 	};
 } else {
 	require('sugar-deprecated')(require('./crashlogger.js'));
-	require('object.values').shim();
+	Object.defineProperty(Object, 'values', {writable: true, configurable: true, value: require('object.values')});
 
 	global.Config = require('./config/config.js');
 
diff --git a/tools.js b/tools.js
index b1865a8555..274b5ba1b1 100644
--- a/tools.js
+++ b/tools.js
@@ -14,7 +14,7 @@
 'use strict';
 
 require('sugar-deprecated')(require('./crashlogger.js'));
-require('object.values').shim();
+Object.defineProperty(Object, 'values', {writable: true, configurable: true, value: require('object.values')});
 
 const fs = require('fs');
 const path = require('path');