upstream/Mekanism-Community-Edition
1
0 Fork 0
mirror of https://github.com/Thorfusion/Mekanism-Community-Edition.git synced 2026-11-13 16:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into 1.8

Browse Source 
Conflicts:
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/item/ItemConfigurator.java
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
	src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
This commit is contained in:
Aidan Brady committed 2014-08-07 12:29:43 -04:00
2 parents faad9762df 008afaf359
commit 81d3d53d76
19 files changed
+459 -196
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/mekanism/client/ClientTickHandler.java
+9 -2
View File
@@ -315,8 +315,15 @@ public class ClientTickHandler
{
if(!lastTickUpdate)
{
((ItemJetpack)jetpack.getItem()).incrementMode(jetpack);
Mekanism.packetHandler.sendToServer(new JetpackDataMessage(JetpackPacket.MODE, null, false));
if(mc.thePlayer.isSneaking())
{
((ItemJetpack)jetpack.getItem()).setMode(stack, JetpackMode.DISABLED);
}
else {
((ItemJetpack)jetpack.getItem()).incrementMode(jetpack);
}
Mekanism.packetHandler.sendToServer(new JetpackDataMessage(JetpackPacket.MODE, null, mc.thePlayer.isSneaking()));
SoundHandler.playSound("mekanism:etc.Hydraulic");
lastTickUpdate = true;
}