From 2d49784e68a25fd91b526a5830ff9741cfadcbfe Mon Sep 17 00:00:00 2001 From: Adubbz Date: Tue, 2 Jul 2013 18:45:52 +1000 Subject: [PATCH] Uncommented transportation code to the Promised Lands, deep was with my eclipse Libraries --- .../biomesoplenty/blocks/BlockPromisedPortal.java | 9 ++++----- .../biomesoplenty/handlers/EntityEventHandler.java | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java b/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java index fdc34e234..0b8b4dd3a 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java +++ b/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java @@ -70,7 +70,7 @@ public class BlockPromisedPortal extends Block return false; } - /*@Override + @Override public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { if (par5Entity.ridingEntity == null && par5Entity.riddenByEntity == null) @@ -80,14 +80,13 @@ public class BlockPromisedPortal extends Block EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity; if (par5Entity.dimension != BOPConfiguration.promisedLandDimID) { - //getConfigurationManager - MinecraftServer.F()..transferPlayerToDimension(thePlayer, BOPConfiguration.promisedLandDimID, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(BOPConfiguration.promisedLandDimID))); + thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, BOPConfiguration.promisedLandDimID, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(BOPConfiguration.promisedLandDimID))); } else { - thePlayer.mcServer..transferPlayerToDimension(thePlayer, 0, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(0))); + thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, 0, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(0))); } } } - }*/ + } } diff --git a/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java b/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java index 207ee9a72..9ef011054 100644 --- a/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java +++ b/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java @@ -85,7 +85,7 @@ public class EntityEventHandler } }*/ - /*@ForgeSubscribe + @ForgeSubscribe public void fallingFromPromisedLand(LivingHurtEvent event) { if (event.source == DamageSource.outOfWorld && event.entityLiving.dimension == BOPConfiguration.promisedLandDimID) @@ -101,7 +101,7 @@ public class EntityEventHandler } } } - }*/ + } @ForgeSubscribe public void chunkEntered(EntityEvent.EnteringChunk event)