Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater

Browse Source
This commit is contained in:
Anuken
2020-04-24 15:46:32 -04:00
parent 32a182cd01 cf186e0219
commit 21946cafd1
25 changed files with 8194 additions and 7785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/entities/def/TileComp.java
View File

@@ -367,7 +367,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
}
public void dumpLiquid(Liquid liquid){
int dump = rotation();
int dump = rotation() / block.dumpIncrement;
for(int i = 0; i < proximity.size; i++){
incrementDump(proximity.size);
@@ -455,7 +455,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
*/
public void offloadNear(Item item){
Array<Tilec> proximity = proximity();
int dump = rotation();
int dump = rotation() / block.dumpIncrement;
useContent(item);
for(int i = 0; i < proximity.size; i++){
@@ -483,7 +483,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
if(!block.hasItems || items.total() == 0 || (todump != null && !items.has(todump))) return false;
Array<Tilec> proximity = proximity();
int dump = rotation();
int dump = rotation() / block.dumpIncrement;
if(proximity.size == 0) return false;
@@ -518,7 +518,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
}
public void incrementDump(int prox){
rotation((byte)((rotation() + 1) % prox));
rotation((byte)((rotation() + block.dumpIncrement) % (prox * block.dumpIncrement)));
}
/** Used for dumping items. */