keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Moved check if map cursor should 'spin' and which world a player respawns in to WorldProvider for PR #308

Browse source
This commit is contained in:
LexManos 2012-12-12 01:22:43 -08:00
parent 17637de863
commit c48a15357b
3 changed files with 47 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
patches/common/net/minecraft/src/MapData.java.patch Normal file
View file

@ -0,0 +1,11 @@
--- ../src_base/common/net/minecraft/src/MapData.java
+++ ../src_work/common/net/minecraft/src/MapData.java
@@ -167,7 +167,7 @@
par8 += par8 < 0.0D ? -8.0D : 8.0D;
var15 = (byte)((int)(par8 * 16.0D / 360.0D));
- if (this.dimension < 0)
+ if (par2World.provider.shouldMapSpin(par3Str, par4, par6, par8))
{
int var17 = (int)(par2World.getWorldInfo().getWorldTime() / 10L);
var15 = (byte)(var17 * var17 * 34187121 + var17 * 121 >> 15 & 15);

16
patches/common/net/minecraft/src/ServerConfigurationManager.java.patch
View file

@ -8,20 +8,24 @@
public abstract class ServerConfigurationManager
{
@@ -296,6 +297,12 @@
@@ -296,6 +297,16 @@
*/
public EntityPlayerMP respawnPlayer(EntityPlayerMP par1EntityPlayerMP, int par2, boolean par3)
{
+ World world = mcServer.worldServerForDimension(par2);
+ if (world == null || !world.provider.canRespawnHere())
+ if (world == null)
+ {
+ par2 = 0;
+ }
+ else if (!world.provider.canRespawnHere())
+ {
+ par2 = world.provider.getRespawnDimension(par1EntityPlayerMP);
+ }
+
par1EntityPlayerMP.getServerForPlayer().getEntityTracker().removeAllTrackingPlayers(par1EntityPlayerMP);
par1EntityPlayerMP.getServerForPlayer().getEntityTracker().removeEntityFromAllTrackingPlayers(par1EntityPlayerMP);
par1EntityPlayerMP.getServerForPlayer().getPlayerManager().removePlayer(par1EntityPlayerMP);
@@ -318,6 +325,7 @@
@@ -318,6 +329,7 @@
EntityPlayerMP var7 = new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension), par1EntityPlayerMP.username, (ItemInWorldManager)var6);
var7.playerNetServerHandler = par1EntityPlayerMP.playerNetServerHandler;
var7.clonePlayer(par1EntityPlayerMP, par3);
@ -29,7 +33,7 @@
var7.entityId = par1EntityPlayerMP.entityId;
WorldServer var8 = this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension);
this.func_72381_a(var7, par1EntityPlayerMP, var8);
@@ -361,14 +369,20 @@
@@ -361,14 +373,20 @@
public void transferPlayerToDimension(EntityPlayerMP par1EntityPlayerMP, int par2)
{
@ -51,7 +55,7 @@
this.func_72375_a(par1EntityPlayerMP, var4);
par1EntityPlayerMP.playerNetServerHandler.setPlayerLocation(par1EntityPlayerMP.posX, par1EntityPlayerMP.posY, par1EntityPlayerMP.posZ, par1EntityPlayerMP.rotationYaw, par1EntityPlayerMP.rotationPitch);
par1EntityPlayerMP.theItemInWorldManager.setWorld(var5);
@@ -389,38 +403,23 @@
@@ -389,38 +407,23 @@
*/
public void transferEntityToWorld(Entity par1Entity, int par2, WorldServer par3WorldServer, WorldServer par4WorldServer)
{
@ -101,7 +105,7 @@
{
ChunkCoordinates var18;
@@ -457,7 +456,7 @@
@@ -457,7 +460,7 @@
par4WorldServer.spawnEntityInWorld(par1Entity);
par1Entity.setLocationAndAngles(var5, par1Entity.posY, var7, par1Entity.rotationYaw, par1Entity.rotationPitch);
par4WorldServer.updateEntityWithOptionalForce(par1Entity, false);

27
patches/common/net/minecraft/src/WorldProvider.java.patch
View file

@ -17,7 +17,7 @@
}
@SideOnly(Side.CLIENT)
@@ -256,4 +258,238 @@
@@ -256,4 +258,263 @@
* Returns the dimension's name, e.g. "The End", "Nether", or "Overworld".
*/
public abstract String getDimensionName();
@ -126,6 +126,31 @@
+ return var5;
+ }
+
+ /**
+ * Determine if the cusor on the map should 'spin' when rendered, like it does for the player in the nether.
+ *
+ * @param entity The entity holding the map, playername, or frame-ENTITYID
+ * @param x X Position
+ * @param y Y Position
+ * @param z Z Postion
+ * @return True to 'spin' the cursor
+ */
+ public boolean shouldMapSpin(String entity, double x, double y, double z)
+ {
+ return dimensionId < 0;
+ }
+
+ /**
+ * Determines the dimension the player will be respawned in, typically this brings them back to the overworld.
+ *
+ * @param player The player that is respawning
+ * @return The dimension to respawn the player in
+ */
+ public int getRespawnDimension(EntityPlayerMP player)
+ {
+ return 0;
+ }
+
+ /*======================================= Start Moved From World =========================================*/
+
+ public BiomeGenBase getBiomeGenForCoords(int x, int z)