fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.12.2' into 4.3-dev

Browse Source
This commit is contained in:
Electroblob77
2020-04-14 17:41:33 +01:00
parent aecc8b0889 937617d7af
commit 91b2ee1a13
32 changed files with 869 additions and 1313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/potion/PotionSlowTime.java
+3 -3
View File
@@ -172,9 +172,9 @@ public class PotionSlowTime extends PotionMagicEffect implements ISyncedPotion {
@SubscribeEvent
public static void onPotionAddedEvent(PotionEvent.PotionAddedEvent event){
if(event.getEntity().world.isRemote && event.getPotionEffect().getPotion() == WizardryPotions.slow_time
&& event.getEntity() == net.minecraft.client.Minecraft.getMinecraft().player){
if(Wizardry.settings.useShaders) net.minecraft.client.Minecraft.getMinecraft().entityRenderer.loadShader(SlowTime.SHADER);
electroblob.wizardry.client.WizardryClientEventHandler.playBlinkEffect();
&& event.getEntity() instanceof EntityPlayer){
Wizardry.proxy.loadShader((EntityPlayer)event.getEntity(), SlowTime.SHADER);
Wizardry.proxy.playBlinkEffect((EntityPlayer)event.getEntity());
}
}