AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-27 15:29:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix block model entities pushing you (Thanks CyberToon)

Browse Source
This commit is contained in:
UnknownShadow200 2017-03-02 16:17:20 +11:00
parent 8f44f43ef2
commit 97636267e2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ClassicalSharp/Entities/Components/PhysicsComponent.cs
View File

@ -1,5 +1,6 @@
// Copyright 2014-2017 ClassicalSharp | Licensed under BSD-3 // Copyright 2014-2017 ClassicalSharp | Licensed under BSD-3
using System; using System;
using ClassicalSharp.Model;
using ClassicalSharp.Physics; using ClassicalSharp.Physics;
using OpenTK; using OpenTK;
@ -275,6 +276,7 @@ namespace ClassicalSharp.Entities {
for (int id = 0; id < EntityList.MaxCount; id++) { for (int id = 0; id < EntityList.MaxCount; id++) {
Entity other = game.Entities[id]; Entity other = game.Entities[id];
if (other == null || other == entity) continue; if (other == null || other == entity) continue;
if (other.Model is BlockModel) continue; // block models shouldn't push you
bool yIntersects = bool yIntersects =
entity.Position.Y <= (other.Position.Y + other.Size.Y) && entity.Position.Y <= (other.Position.Y + other.Size.Y) &&