mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-08 01:43:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #10101

Browse Source
This commit is contained in:
Anuken 2024-08-08 07:17:02 -04:00
parent 3a5c5b0196
commit 98676af510
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/input/DesktopInput.java
View File

@ -108,6 +108,10 @@ public class DesktopInput extends InputHandler{
@Override
public void drawTop(){
if(cursorType != SystemCursor.arrow && scene.hasMouse()){
graphics.cursor(cursorType = SystemCursor.arrow);
}
Lines.stroke(1f);
int cursorX = tileX(Core.input.mouseX());
int cursorY = tileY(Core.input.mouseY());
@ -446,6 +450,8 @@ public class DesktopInput extends InputHandler{
Tile cursor = tileAt(Core.input.mouseX(), Core.input.mouseY());
cursorType = SystemCursor.arrow;
if(cursor != null){
if(cursor.build != null && cursor.build.interactable(player.team())){
cursorType = cursor.build.getCursor();
@ -498,9 +504,9 @@ public class DesktopInput extends InputHandler{
if(!Core.scene.hasMouse()){
Core.graphics.cursor(cursorType);
}else{
cursorType = SystemCursor.arrow;
}
cursorType = SystemCursor.arrow;
}
@Override
@ -668,7 +674,7 @@ public class DesktopInput extends InputHandler{
lastLineY = cursorY;
mode = placing;
updateLine(selectX, selectY);
}else if(plan != null && !plan.breaking && mode == none && !plan.initialized){
}else if(plan != null && !plan.breaking && mode == none && !plan.initialized && plan.progress <= 0f){
splan = plan;
}else if(plan != null && plan.breaking){
deleting = true;

4
core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java
View File

@ -73,9 +73,9 @@ public class ContinuousLiquidTurret extends ContinuousTurret{
@Override
public void updateTile(){
unit.ammo(unit.type().ammoCapacity * liquids.currentAmount() / liquidCapacity);
super.updateTile();
unit.ammo(unit.type().ammoCapacity * liquids.currentAmount() / liquidCapacity);
}
@Override