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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
LexManos 2012-08-22 18:04:06 -07:00
parent 6f89cf54b8 25aef3543b
commit 3a604ac0fa
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fml-src-3.0.108.315.zip → fml-src-3.0.128.319.zip
View File

Binary file not shown.

52
patches/common/net/minecraft/src/EntityMinecart.java.patch
View File

@ -42,7 +42,7 @@
public EntityMinecart(World par1World)
{
super(par1World);
@@ -40,6 +65,18 @@
@@ -40,6 +67,18 @@
this.preventEntitySpawning = true;
this.setSize(0.98F, 0.7F);
this.yOffset = this.height / 2.0F;
@ -61,7 +61,7 @@
}
/**
@@ -65,6 +102,10 @@
@@ -65,6 +104,10 @@
*/
public AxisAlignedBB getCollisionBox(Entity par1Entity)
{
@ -72,7 +72,7 @@
return par1Entity.boundingBox;
}
@@ -73,6 +114,10 @@
@@ -73,6 +116,10 @@
*/
public AxisAlignedBB getBoundingBox()
{
@ -83,7 +83,7 @@
return null;
}
@@ -81,7 +126,7 @@
@@ -81,7 +128,7 @@
*/
public boolean canBePushed()
{
@ -92,7 +92,7 @@
}
public EntityMinecart(World par1World, double par2, double par4, double par6, int par8)
@@ -130,48 +175,7 @@
@@ -130,48 +177,7 @@
}
this.setDead();
@ -142,7 +142,7 @@
}
return true;
@@ -266,7 +270,7 @@
@@ -266,7 +272,7 @@
this.kill();
}
@ -151,7 +151,7 @@
{
this.worldObj.spawnParticle("largesmoke", this.posX, this.posY + 0.8D, this.posZ, 0.0D, 0.0D, 0.0D);
}
@@ -310,17 +314,17 @@
@@ -310,17 +316,17 @@
double var6 = 0.0078125D;
int var8 = this.worldObj.getBlockId(var1, var2, var3);
@ -172,7 +172,7 @@
var12 = !var11;
}
@@ -334,25 +338,7 @@
@@ -334,25 +340,7 @@
this.posY = (double)(var2 + 1);
}
@ -199,7 +199,7 @@
int[][] var13 = field_70500_g[var10];
double var14 = (double)(var13[1][0] - var13[0][0]);
@@ -385,7 +371,7 @@
@@ -385,7 +373,7 @@
}
}
@ -208,7 +208,7 @@
{
var24 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
@@ -433,36 +419,8 @@
@@ -433,36 +421,8 @@
this.posX = var26 + var14 * var24;
this.posZ = var28 + var16 * var24;
this.setPosition(this.posX, this.posY + (double)this.yOffset, this.posZ);
@ -247,7 +247,7 @@
if (var13[0][1] != 0 && MathHelper.floor_double(this.posX) - var1 == var13[0][0] && MathHelper.floor_double(this.posZ) - var3 == var13[0][2])
{
@@ -473,42 +431,7 @@
@@ -473,42 +433,7 @@
this.setPosition(this.posX, this.posY + (double)var13[1][1], this.posZ);
}
@ -291,7 +291,7 @@
Vec3 var52 = this.func_70489_a(this.posX, this.posY, this.posZ);
@@ -538,30 +461,14 @@
@@ -538,30 +463,14 @@
double var41;
@ -330,7 +330,7 @@
{
var41 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
@@ -599,41 +506,7 @@
@@ -599,41 +508,7 @@
}
else
{
@ -373,7 +373,7 @@
}
this.rotationPitch = 0.0F;
@@ -659,7 +532,18 @@
@@ -659,7 +534,18 @@
}
this.setRotation(this.rotationYaw, this.rotationPitch);
@ -393,7 +393,7 @@
if (var15 != null && !var15.isEmpty())
{
@@ -684,17 +568,8 @@
@@ -684,17 +570,8 @@
this.riddenByEntity = null;
}
@ -413,7 +413,7 @@
}
}
@@ -718,12 +593,7 @@
@@ -718,12 +595,7 @@
}
else
{
@ -427,7 +427,7 @@
par3 = (double)var10;
@@ -769,13 +639,8 @@
@@ -769,13 +641,8 @@
if (BlockRail.isRailBlock(var10))
{
@ -442,7 +442,7 @@
if (var11 >= 2 && var11 <= 5)
{
@@ -840,13 +705,14 @@
@@ -840,13 +707,14 @@
{
par1NBTTagCompound.setInteger("Type", this.minecartType);
@ -461,7 +461,7 @@
{
NBTTagList var2 = new NBTTagList();
@@ -872,13 +738,21 @@
@@ -872,13 +740,21 @@
{
this.minecartType = par1NBTTagCompound.getInteger("Type");
@ -487,7 +487,7 @@
{
NBTTagList var2 = par1NBTTagCompound.getTagList("Items");
this.cargoItems = new ItemStack[this.getSizeInventory()];
@@ -907,11 +781,17 @@
@@ -907,11 +783,17 @@
*/
public void applyEntityCollision(Entity par1Entity)
{
@ -506,7 +506,7 @@
{
par1Entity.mountEntity(this);
}
@@ -957,7 +837,7 @@
@@ -957,7 +839,7 @@
double var18 = par1Entity.motionX + this.motionX;
double var20 = par1Entity.motionZ + this.motionZ;
@ -515,7 +515,7 @@
{
this.motionX *= 0.20000000298023224D;
this.motionZ *= 0.20000000298023224D;
@@ -965,7 +845,7 @@
@@ -965,7 +847,7 @@
par1Entity.motionX *= 0.949999988079071D;
par1Entity.motionZ *= 0.949999988079071D;
}
@ -524,7 +524,7 @@
{
par1Entity.motionX *= 0.20000000298023224D;
par1Entity.motionZ *= 0.20000000298023224D;
@@ -1000,7 +880,7 @@
@@ -1000,7 +882,7 @@
*/
public int getSizeInventory()
{
@ -533,7 +533,7 @@
}
/**
@@ -1103,7 +983,12 @@
@@ -1103,7 +985,12 @@
*/
public boolean interact(EntityPlayer par1EntityPlayer)
{
@ -547,7 +547,7 @@
{
if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != par1EntityPlayer)
{
@@ -1115,14 +1000,14 @@
@@ -1115,14 +1002,14 @@
par1EntityPlayer.mountEntity(this);
}
}
@ -564,7 +564,7 @@
{
ItemStack var2 = par1EntityPlayer.inventory.getCurrentItem();
@@ -1246,4 +1131,375 @@
@@ -1246,4 +1133,375 @@
{
return this.dataWatcher.getWatchableObjectInt(18);
}

12
patches/common/net/minecraft/src/ServerConfigurationManager.java.patch
View File

@ -1,14 +1,14 @@
--- ../src_base/common/net/minecraft/src/ServerConfigurationManager.java
+++ ../src_work/common/net/minecraft/src/ServerConfigurationManager.java
@@ -15,6 +15,7 @@
import cpw.mods.fml.common.network.FMLNetworkHandler;
@@ -16,6 +16,7 @@
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.server.MinecraftServer;
+import net.minecraftforge.common.DimensionManager;
public abstract class ServerConfigurationManager
{
@@ -317,6 +318,7 @@
@@ -319,6 +320,7 @@
EntityPlayerMP var6 = new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension), par1EntityPlayerMP.username, (ItemInWorldManager)var5);
var6.clonePlayer(par1EntityPlayerMP, par3);
@ -16,7 +16,7 @@
var6.entityId = par1EntityPlayerMP.entityId;
var6.serverForThisPlayer = par1EntityPlayerMP.serverForThisPlayer;
WorldServer var7 = this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension);
@@ -359,6 +361,11 @@
@@ -362,6 +364,11 @@
public void transferPlayerToDimension(EntityPlayerMP par1EntityPlayerMP, int par2)
{
@ -28,7 +28,7 @@
int var3 = par1EntityPlayerMP.dimension;
WorldServer var4 = this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension);
par1EntityPlayerMP.dimension = par2;
@@ -366,33 +373,14 @@
@@ -369,33 +376,14 @@
par1EntityPlayerMP.serverForThisPlayer.sendPacketToPlayer(new Packet9Respawn(par1EntityPlayerMP.dimension, (byte)par1EntityPlayerMP.worldObj.difficultySetting, var5.getWorldInfo().getTerrainType(), var5.getHeight(), par1EntityPlayerMP.theItemInWorldManager.getGameType()));
var4.removeEntity(par1EntityPlayerMP);
par1EntityPlayerMP.isDead = false;
@ -70,7 +70,7 @@
{
ChunkCoordinates var12 = var5.getEntrancePortalLocation();
var6 = (double)var12.posX;
@@ -416,7 +404,7 @@
@@ -419,7 +407,7 @@
var5.spawnEntityInWorld(par1EntityPlayerMP);
par1EntityPlayerMP.setLocationAndAngles(var6, par1EntityPlayerMP.posY, var8, par1EntityPlayerMP.rotationYaw, par1EntityPlayerMP.rotationPitch);
var5.updateEntityWithOptionalForce(par1EntityPlayerMP, false);