Removed conflicts

DragonetMC · Mar 16, 2015 · 0d476f6 · 0d476f6 · Creeperface01 · Mar 16, 2015
2 parents c93e81c + c9809ff
commit 0d476f6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 17 deletions.
diff --git a/src/main/java/net/glowstone/EventFactory.java b/src/main/java/net/glowstone/EventFactory.java
@@ -170,7 +170,11 @@ public static PlayerInteractEvent onPlayerInteract(Player player, Action action)
 
     public static PlayerInteractEvent onPlayerInteract(Player player, Action action, Block clicked, BlockFace face) {
         //Dragonet-Add
+<<<<<<< HEAD
         org.dragonet.DragonetServer.instance().getRhino().useItem(clicked.getX(), clicked.getY(), clicked.getZ(), face.name(), clicked.getType().name(), player);
+=======
+        org.dragonet.DragonetServer.instance().getRhino().useItem(clicked.getX(), clicked.getY(), clicked.getZ(), face.name(), clicked.getType().name(), player.getName());
+>>>>>>> c9809ff8faa896943476b654da20442535c08aca
         //Dragonet-End
         return callEvent(new PlayerInteractEvent(player, action, player.getItemInHand(), clicked, face));
     }

diff --git a/src/main/java/net/glowstone/net/handler/play/player/BlockPlacementHandler.java b/src/main/java/net/glowstone/net/handler/play/player/BlockPlacementHandler.java
@@ -53,7 +53,11 @@ public void handle(GlowSession session, BlockPlacementMessage message) {
         GlowBlock clicked = player.getWorld().getBlockAt(message.getX(), message.getY(), message.getZ());
 
         //Dragonet-Add
+<<<<<<< HEAD
         org.dragonet.DragonetServer.instance().getRhino().useItem(message.getX(), message.getY(), message.getZ(), "RIGHT_CLICK_BLOCK", player.getWorld().getBlockAt(message.getX(), message.getY(), message.getZ()).getType().name(), player);        
+=======
+        org.dragonet.DragonetServer.instance().getRhino().useItem(message.getX(), message.getY(), message.getZ(), "RIGHT_CLICK_BLOCK", player.getWorld().getBlockAt(message.getX(), message.getY(), message.getZ()).getType().name(), player.getName());        
+>>>>>>> c9809ff8faa896943476b654da20442535c08aca
         /**
          * Check if the message is a -1. If we *just* got a message with the
          * values filled, discard it, otherwise perform right-click-air.

diff --git a/src/main/java/net/glowstone/net/handler/play/player/DiggingHandler.java b/src/main/java/net/glowstone/net/handler/play/player/DiggingHandler.java
@@ -37,7 +37,11 @@ public void handle(GlowSession session, DiggingMessage message) {
         if (message.getState() == DiggingMessage.START_DIGGING) {
 
             //Dragonet-Add
+<<<<<<< HEAD
             org.dragonet.DragonetServer.instance().getRhino().useItem(message.getX(), message.getY(), message.getZ(), face.name(), player.getWorld().getBlockAt(message.getX(), message.getY(), message.getZ()).getType().name(), player);      
+=======
+            org.dragonet.DragonetServer.instance().getRhino().useItem(message.getX(), message.getY(), message.getZ(), face.name(), player.getWorld().getBlockAt(message.getX(), message.getY(), message.getZ()).getType().name(), player.getName());      
+>>>>>>> c9809ff8faa896943476b654da20442535c08aca
             // call interact event
             Action action = Action.LEFT_CLICK_BLOCK;
             Block eventBlock = block;

diff --git a/src/main/java/org/dragonet/rhino/Rhino.java b/src/main/java/org/dragonet/rhino/Rhino.java
@@ -34,12 +34,16 @@ public void useItem(int blockX, int blockY, int blockZ, String blockFace, String
         useItem.useItem(blockX, blockY, blockZ, blockFace, blockName, plr);
     }
 
+<<<<<<< HEAD
     public void onConnect(Player plr)
     {
         onConnect.onConnect(plr);
     }
 
     public void onQuit(Player plr)
+=======
+    public void onConnect(String playerName)
+>>>>>>> c9809ff8faa896943476b654da20442535c08aca
     {
         onQuit.onQuit(plr);
     }

diff --git a/src/main/java/org/dragonet/rhino/api/functions/Functions.java b/src/main/java/org/dragonet/rhino/api/functions/Functions.java
@@ -12,9 +12,15 @@
  */
 public class Functions
 {
+<<<<<<< HEAD
     public static String[] Functions = new String[] {"clientMessage", "addItemInventory", "getCurrentWorld", "setBlock", "setArea", "getServerName"};
 
     public static Class[] Classes = new Class[] {clientMessage.class, addItemInventory.class, getCurrentWorld.class, setBlock.class, setArea.class, getServerName.class};
+=======
+    public static String[] Functions = new String[] {"clientMessage", "addItemInventory", "getCurrentWorld", "setBlock"};
+
+    public static Class[] Classes = new Class[] {clientMessage.class, addItemInventory.class, getCurrentWorld.class, setBlock.class};
+>>>>>>> c9809ff8faa896943476b654da20442535c08aca
 
     public static void defineFunctions(Scriptable scope)
     {

diff --git a/src/main/java/org/dragonet/rhino/api/functions/disconnectPlayer.java b/src/main/java/org/dragonet/rhino/api/functions/disconnectPlayer.java