From 13977992d72e223ba90c0eb993395e9dbb4fce65 Mon Sep 17 00:00:00 2001 From: dginovker Date: Fri, 20 Dec 2019 12:35:12 -0500 Subject: [PATCH] Fix most of the clipping (minor stuff with doors left) --- .../game/globalworldobjects/Doors.java | 19 +++--------------- .../game/globalworldobjects/DoubleDoors.java | 8 ++++++-- .../src/com/rebotted/world/ObjectHandler.java | 2 ++ .../src/com/rebotted/world/clip/Region.java | 2 +- .../game/globalworldobjects/Doors.class | Bin 6953 -> 6916 bytes .../game/globalworldobjects/DoubleDoors.class | Bin 7953 -> 8037 bytes .../com/rebotted/world/ObjectHandler.class | Bin 10353 -> 10433 bytes .../com/rebotted/world/clip/Region.class | Bin 18160 -> 18160 bytes 8 files changed, 12 insertions(+), 19 deletions(-) diff --git a/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java b/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java index 1a2f14d5..d924831f 100644 --- a/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java +++ b/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java @@ -56,30 +56,17 @@ public class Doors { } public boolean handleDoor(Player player, int id, int x, int y, int z) { - Doors d = getDoor(id, x, y, z); if (d == null) { - if (DoubleDoors.getSingleton().handleDoor(player, id, x, y, z)) { - return true; - } - return false; + return DoubleDoors.getSingleton().handleDoor(player, id, x, y, z); } //todo: improvment: if player manage to get to door then open the door. if(player.distanceToPoint(x, y) > 1) return false; - /** - * Here we shall remove the clipping from the door - * We can't add the clipping back when it is closed, because we apparently never update the d.open value.... - */ - if(d != null) { - if(d.open == 0) { - Region.removeClipping(x, y, z); - } else { - //Region.addClipping(x, y, z, 0); - } - } + //Remove clipping for old door (gets added back in placeObject) + Region.removeClipping(x, y, z); int xAdjustment = 0, yAdjustment = 0; if (d.type == 0) { diff --git a/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java b/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java index 4de452fd..32decf3a 100644 --- a/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java +++ b/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java @@ -10,6 +10,7 @@ import java.util.Scanner; import com.rebotted.GameEngine; import com.rebotted.game.objects.Objects; import com.rebotted.game.players.Player; +import com.rebotted.world.clip.Region; /** * @@ -47,8 +48,8 @@ public class DoubleDoors { } public boolean handleDoor(Player player, int id, int x, int y, int z) { - DoubleDoors doorClicked = getDoor(id, x, y, z); - + DoubleDoors doorClicked = getDoor(id, x, y, z); + if (doorClicked == null) { //GameEngine.objectHandler.placeObject(new Objects(-1, x, y, z, 0, 0, 0)); return true; @@ -56,6 +57,9 @@ public class DoubleDoors { if (doorClicked.doorId > 12000) { return true; //nearly all of these are not opened } + + Region.removeClipping(x, y, z); + if (doorClicked.open == 0) { if (doorClicked.originalFace == 0) { DoubleDoors lowerDoor = getDoor(id - 3, x, y -1, z); diff --git a/2006Redone Server/src/com/rebotted/world/ObjectHandler.java b/2006Redone Server/src/com/rebotted/world/ObjectHandler.java index 38f72b5b..66789202 100644 --- a/2006Redone Server/src/com/rebotted/world/ObjectHandler.java +++ b/2006Redone Server/src/com/rebotted/world/ObjectHandler.java @@ -15,6 +15,7 @@ import com.rebotted.game.players.Client; import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerHandler; import com.rebotted.util.Misc; +import com.rebotted.world.clip.Region; /** * @author Sanity @@ -135,6 +136,7 @@ public class ObjectHandler { * Creates the object for anyone who is within 60 squares of the object **/ public void placeObject(Objects o) { + Region.addClipping(o.getObjectX(), o.getObjectY(), o.getObjectHeight(), 0); for (Player p : PlayerHandler.players) { if (p != null) { Client person = (Client) p; diff --git a/2006Redone Server/src/com/rebotted/world/clip/Region.java b/2006Redone Server/src/com/rebotted/world/clip/Region.java index f3ca988e..ae4d8a04 100644 --- a/2006Redone Server/src/com/rebotted/world/clip/Region.java +++ b/2006Redone Server/src/com/rebotted/world/clip/Region.java @@ -289,7 +289,7 @@ public class Region { return projectileClips[height][x - regionAbsX][y - regionAbsY]; } - private static void addClipping(int x, int y, int height, int shift) { + public static void addClipping(int x, int y, int height, int shift) { int regionX = x >> 3; int regionY = y >> 3; int regionId = (regionX / 8 << 8) + regionY / 8; diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/globalworldobjects/Doors.class b/CompiledServer/production/2006rebotted/com/rebotted/game/globalworldobjects/Doors.class index 41e4ec2ea184ddf6077f131dbd343240f70a6735..392f3c31e81b77658eeccf9e8b5777c1f35f3a63 100644 GIT binary patch delta 837 zcmXAn3rx*%6vsd3cPn*E#BLOgyyiJec5SuHGD9ADKk}*+qNpryu2+^Aw(F7dOdioD zE>{eR$YX4tn_;n-cNQZXHpjK!_B)^7?|;tk{LlHGQu}&)`I11pR~=SeSh{p?8)oye zd7q+9;KGLO}3~@7GZn8k`ktr|9 zk~(taGmA`978@H&O>dT&XqKBeR+_o2GTAuH3Ras9tTj&7nIhJkQgY2{Hkd2qnY(N> zkI6T6I5wG2Y&MN-wRF;YrfM%T@z;la$zVQy`dr)p^sl{4V}N@6qXp_G9!k?L84o2Z zSv)jT$;(42O5OxmLYbqnKJ+tR$kMweL}}*iU`1bT6Lco@H|?6RFyIf7uC$hZ#<5)^ zcc?NuX~{0aDWD6xu~Vpe6{#M3wEufmm3^eLU;pQTDpSmA4zYz2oE%m!t!pKEfGYB|GospN)Kb6ak4#~B&CCg{GF{RlrzY~>+=JaJwR&JTO4 zMLi>w=URC!-FT^ES4)K2NM1S9Tm6iAtub$C&RbgXP6zWnUHPCMA9XN4F_6zXj`ig5 wMaynr1z&Nf%~hMnH`l?|LDGUBnzKS>4wdJ0SSM@egFUf delta 874 zcmXAncWlj36vsd3{@#0DM;cXamDd;zO6w0LZEPt~YDC1W5vo?K)-1}iinKLfj2bao zyR^KjicMAQnGj+{2uTsE_Bbl{kMq6Xd(O@Ip6^*4yEnEdJ)oQ2iLV~4R!v>u!M0%g zQR=mJggGt}T1x$>|6By{Tk_`9rSd%VsOCN)x2wryo02@g#io zJJ)~o&jHojQK$D0P1ZcALgVO)cB5RfBC86GRAj3{DT?g)Tg@1&wT?&<%{$VRtVT~$ z!4ySK9V;}(^^=HdItBllzlid74)QVX?OMA-y~-nqeD!K4jo3vjyJ^E7y0e$w?9=J* zXA}k6(E-vaWIjc#;1C`TYo%8+iz!v7PEx`(j&fUXk2uB)PViRQ&zusA)8gce)Z(m! zb55FZUSi@YlXxyj0_D<&i;~18_3N^vaz&ou@ltOMvF}LM3cchGa z>f3!!K*)l?$2fR~4^MQFpAx`x&$f`P@Rus;6}5S-%U3}Y-Vm*^xyBZ}^(2ITZTDVl zK2V)cgldy@sU(swn(>v^e4`WJbzy%nou4ZEHyQlFtua&MGQpcsD^O~vFkfB7Ah8py VxQ;lzTf>sXFI3&j*0CFM{sR9#%BKJT diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/globalworldobjects/DoubleDoors.class b/CompiledServer/production/2006rebotted/com/rebotted/game/globalworldobjects/DoubleDoors.class index 43c81377500e393cbbd051e8748e613f95cf8554..967bf87d55073260c26f920e35a5d565f412c33f 100644 GIT binary patch literal 8037 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 THT|2irmb#SP0BrNTiEtL!tLVz literal 7953 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 Q%6W`kOUj4Yw(ybv1uPfD5&!@I diff --git a/CompiledServer/production/2006rebotted/com/rebotted/world/ObjectHandler.class b/CompiledServer/production/2006rebotted/com/rebotted/world/ObjectHandler.class index 0d73d549c72dd4f3350ea99ca657e7689badf021..4bd04582b37420fec34a9355e986295342f30b63 100644 GIT binary patch delta 4826 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 WR=HDdgO~3<^MxloG>H*IF8C*UzJnG3 delta 4843 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 diff --git a/CompiledServer/production/2006rebotted/com/rebotted/world/clip/Region.class b/CompiledServer/production/2006rebotted/com/rebotted/world/clip/Region.class index 081593a89d000dab5c561a0ce1ab97eb5c95b1c5..13d63f910b57197e31dbfbed9c54477a7ad0183a 100644 GIT binary patch delta 16 Xcmey+%lM&}af7ZZBj;v4)kBH^I$Z_w delta 16 Xcmey+%lM&}af7ZZBiCj<)kBH^I%5U%