From cdd97294a94a8118ce534a03c4b76a413e57ef2e Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Wed, 5 Aug 2020 11:27:13 -0400
Subject: [PATCH] Tweak Energy Portal

---
 .../block/portal/EnergyPortalBlock.java           |   7 +++++--
 .../textures/block/energy_beam.png                | Bin 0 -> 490 bytes
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/energy_beam.png

diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/portal/EnergyPortalBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/portal/EnergyPortalBlock.java
index 664d7c9..c0418c6 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/portal/EnergyPortalBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/portal/EnergyPortalBlock.java
@@ -140,9 +140,12 @@ public class EnergyPortalBlock extends SimpleBlock {
     public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
         super.onEntityCollision(state, world, pos, entity);
 
-        if (!world.isClient() && !entity.hasVehicle() && entity.canUsePortals() && !((PortalCooldownEntity) entity).isEnergyPortalCooldown() && VoxelShapes.matchesAnywhere(VoxelShapes.cuboid(entity.getBoundingBox().offset(-pos.getX(), -pos.getY(), -pos.getZ())), state.getOutlineShape(world, pos), BooleanBiFunction.AND)) {
+        if (!world.isClient() && !entity.hasVehicle() && entity.canUsePortals() && VoxelShapes.matchesAnywhere(VoxelShapes.cuboid(entity.getBoundingBox().offset(-pos.getX(), -pos.getY(), -pos.getZ())), state.getOutlineShape(world, pos), BooleanBiFunction.AND)) {
+            boolean cooling = ((PortalCooldownEntity) entity).isEnergyPortalCooldown();
             ((PortalCooldownEntity) entity).resetEnergyPortalCooldown();
-            EnergyTeleporter.teleport((ServerWorld) world, entity.getPos(), pos, entity);
+            if (!cooling) {
+                EnergyTeleporter.teleport((ServerWorld) world, entity.getPos(), pos, entity);
+            }
         }
     }
 
diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/energy_beam.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/energy_beam.png
new file mode 100644
index 0000000000000000000000000000000000000000..36edef4bc634ad802cdd2e07a65f0308593e10c0
GIT binary patch
literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004QX+uL$X=7sm
z04R}lk-bYoQ5eR5YGIV&P*6mHgGPga6hvd$;36Srkkz8sufUJXy-G-H(9$3@L@j*{
z{Rg!Mtp!0)1Q8AW1$`|cxA$aVgr3W}?~mu4=jEK|fIXbo3T8(D3dOP!4Fx?*@nw(m
z1t%j6;KQBJOno*I3Db6b-eFVqc3kypzpv%!Nu^B<Y+b@rnr@VZXN1G+WnJ;MaKDyI
zq=XNJ{e~P+_)6)?20ts#Huzn!5sS`&UG?;2|8VjTYdNDJJSOZd<SW|mdDKl@>Ehyo
z)FGL}m_!K?#6yw_Yvd_2F109`we|&meDjpVqsd>ViXo0HIq~{Mtw`6j)Qsq9`SMg%
z?*H>NGm{gI?yewoK3UeA51cztuUXdDk!977!SM(e#iqX`IZc0vUTbRJ18{G`*=18p
z?!x&N3_j=yBk?0SWZE+scs+&QIP~2>_evwH-*ryzA+{k;bPap^Fe>}qtKa#&Xa`Z(
z3BUjV010qNS#tmY4`BcR4`BhQKc{H`001IML_t(IPh&h``l6nJ0>DIpUa;0t14hGO
gG#x;4(ZJ^g0QK<#grU}HC;$Ke07*qoM6N<$f;O|+EdT%j

literal 0
HcmV?d00001