jeena/chuck.js
1
0
Fork 0
mirror of https://github.com/logsol/chuck.js.git synced 2026-05-11 10:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into subbodies

Browse source
This commit is contained in:
Jeena 2015-08-02 16:06:57 +02:00
commit 0b8d885d48
7 changed files with 56 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Game/Channel/Control/PlayerController.js
View file

@ -45,7 +45,7 @@ function(Parent, Nc, Parser, Settings) {
this.player.suicide();
};
PlayerController.prototype.mePositionStateUpdate = function(update) {
PlayerController.prototype.mePositionStateOverride = function(update) {
if(!this.player.isSpawned()) {
// if someone still falls but is dead on the server already
@ -57,7 +57,7 @@ function(Parent, Nc, Parser, Settings) {
y: Math.abs(update.p.y - this.player.doll.body.GetPosition().y)
};
if(true || difference.x < Settings.PUNKBUSTER_DIFFERENCE_METERS &&
if(difference.x < Settings.PUNKBUSTER_DIFFERENCE_METERS &&
difference.y < Settings.PUNKBUSTER_DIFFERENCE_METERS) {
this.player.doll.updatePositionState(update);
} else {