xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Rollback to the state of .152 build with some critical fixes and updates

Browse Source
This commit is contained in:
Sergey Shatunov
2016-01-04 12:38:37 +07:00
parent 40c95e49c0
commit f722fccdce
38 changed files with 406 additions and 1452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
patches/net/minecraft/entity/player/EntityPlayer.java.patch
View File

@ -62,24 +62,6 @@
public int experienceLevel;
public int experienceTotal;
public float experience;
@@ -254,7 +281,7 @@
--this.xpCooldown;
}
- if (this.isPlayerSleeping())
+ /*if (this.isPlayerSleeping()) KCauldron - moved into EntityPlayerMP
{
++this.sleepTimer;
@@ -283,7 +310,7 @@
{
this.sleepTimer = 0;
}
- }
+ }*/
super.onUpdate();
@@ -416,6 +443,42 @@
{
this.updateItemUse(this.itemInUse, 16);
@ -503,15 +485,6 @@
if (p_70999_1_)
{
this.sleepTimer = 0;
@@ -1491,7 +1712,7 @@
}
}
- private boolean isInBed()
+ protected boolean isInBed() // KCauldron - private -> protected
{
return this.worldObj.getBlock(this.playerLocation.posX, this.playerLocation.posY, this.playerLocation.posZ).isBed(worldObj, playerLocation.posX, playerLocation.posY, playerLocation.posZ, this);
}
@@ -1606,11 +1827,13 @@
{
this.spawnChunk = new ChunkCoordinates(p_71063_1_);

73
patches/net/minecraft/entity/player/EntityPlayerMP.java.patch
View File

@ -190,46 +190,7 @@
iterator1.remove();
}
}
@@ -286,6 +384,38 @@
}
}
}
+ // KCauldron start
+ if (this.isPlayerSleeping())
+ {
+ ++this.sleepTimer;
+
+ if (this.sleepTimer > 100)
+ {
+ this.sleepTimer = 100;
+ }
+
+ if (!this.worldObj.isRemote)
+ {
+ if (!this.isInBed())
+ {
+ this.wakeUpPlayer(true, true, false);
+ }
+ else if (this.worldObj.isDaytime())
+ {
+ this.wakeUpPlayer(false, true, true);
+ }
+ }
+ }
+ else if (this.sleepTimer > 0)
+ {
+ ++this.sleepTimer;
+
+ if (this.sleepTimer >= 110)
+ {
+ this.sleepTimer = 0;
+ }
+ }
+ // KCauldron end
}
public void onUpdateEntity()
@@ -309,9 +439,10 @@
@@ -309,9 +407,10 @@
}
}
@ -241,7 +202,7 @@
this.lastHealth = this.getHealth();
this.lastFoodLevel = this.foodStats.getFoodLevel();
this.wasHungry = this.foodStats.getSaturationLevel() == 0.0F;
@@ -320,16 +451,18 @@
@@ -320,16 +419,18 @@
if (this.getHealth() + this.getAbsorptionAmount() != this.field_130068_bO)
{
this.field_130068_bO = this.getHealth() + this.getAbsorptionAmount();
@ -267,7 +228,7 @@
if (this.experienceTotal != this.lastExperience)
{
this.lastExperience = this.experienceTotal;
@@ -340,6 +473,20 @@
@@ -340,6 +441,20 @@
{
this.func_147098_j();
}
@ -288,7 +249,7 @@
}
catch (Throwable throwable)
{
@@ -402,34 +549,74 @@
@@ -402,34 +517,74 @@
public void onDeath(DamageSource p_70645_1_)
{
@ -372,7 +333,7 @@
score.func_96648_a();
}
@@ -495,7 +682,8 @@
@@ -495,7 +650,8 @@
public boolean canAttackPlayer(EntityPlayer p_96122_1_)
{
@ -382,7 +343,7 @@
}
public void travelToDimension(int p_71027_1_)
@@ -526,7 +714,10 @@
@@ -526,7 +682,10 @@
this.triggerAchievement(AchievementList.portal);
}
@ -394,7 +355,7 @@
this.lastExperience = -1;
this.lastHealth = -1.0F;
this.lastFoodLevel = -1;
@@ -569,6 +760,11 @@
@@ -569,6 +728,11 @@
public void wakeUpPlayer(boolean p_70999_1_, boolean p_70999_2_, boolean p_70999_3_)
{
@ -406,7 +367,7 @@
if (this.isPlayerSleeping())
{
this.getServerForPlayer().getEntityTracker().func_151248_b(this, new S0BPacketAnimation(this, 2));
@@ -584,11 +780,27 @@
@@ -584,11 +748,27 @@
public void mountEntity(Entity p_70078_1_)
{
@ -437,7 +398,7 @@
protected void updateFallState(double p_70064_1_, boolean p_70064_3_) {}
public void handleFalling(double p_71122_1_, boolean p_71122_3_)
@@ -610,29 +822,64 @@
@@ -610,29 +790,64 @@
this.currentWindowId = this.currentWindowId % 100 + 1;
}
@ -505,7 +466,7 @@
this.openContainer.windowId = this.currentWindowId;
this.openContainer.addCraftingToCrafters(this);
}
@@ -644,71 +891,150 @@
@@ -644,71 +859,150 @@
this.closeScreen();
}
@ -664,7 +625,7 @@
this.openContainer.windowId = this.currentWindowId;
this.openContainer.addCraftingToCrafters(this);
InventoryMerchant inventorymerchant = ((ContainerMerchant)this.openContainer).getMerchantInventory();
@@ -725,7 +1051,7 @@
@@ -725,7 +1019,7 @@
merchantrecipelist.func_151391_a(packetbuffer);
this.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload("MC|TrList", packetbuffer));
}
@ -673,7 +634,7 @@
{
logger.error("Couldn\'t send trade list", ioexception);
}
@@ -738,6 +1064,17 @@
@@ -738,6 +1032,17 @@
public void displayGUIHorse(EntityHorse p_110298_1_, IInventory p_110298_2_)
{
@ -691,7 +652,7 @@
if (this.openContainer != this.inventoryContainer)
{
this.closeScreen();
@@ -745,7 +1082,7 @@
@@ -745,7 +1050,7 @@
this.getNextWindowId();
this.playerNetServerHandler.sendPacket(new S2DPacketOpenWindow(this.currentWindowId, 11, p_110298_2_.getInventoryName(), p_110298_2_.getSizeInventory(), p_110298_2_.hasCustomInventoryName(), p_110298_1_.getEntityId()));
@ -700,7 +661,7 @@
this.openContainer.windowId = this.currentWindowId;
this.openContainer.addCraftingToCrafters(this);
}
@@ -770,6 +1107,15 @@
@@ -770,6 +1075,15 @@
{
this.playerNetServerHandler.sendPacket(new S30PacketWindowItems(p_71110_1_.windowId, p_71110_2_));
this.playerNetServerHandler.sendPacket(new S2FPacketSetSlot(-1, -1, this.inventory.getItemStack()));
@ -716,7 +677,7 @@
}
public void sendProgressBarUpdate(Container p_71112_1_, int p_71112_2_, int p_71112_3_)
@@ -779,6 +1125,7 @@
@@ -779,6 +1093,7 @@
public void closeScreen()
{
@ -724,7 +685,7 @@
this.playerNetServerHandler.sendPacket(new S2EPacketCloseWindow(this.openContainer.windowId));
this.closeContainer();
}
@@ -853,8 +1200,19 @@
@@ -853,8 +1168,19 @@
public void setPlayerHealthUpdated()
{
this.lastHealth = -1.0E8F;
@ -744,7 +705,7 @@
public void addChatComponentMessage(IChatComponent p_146105_1_)
{
this.playerNetServerHandler.sendPacket(new S02PacketChat(p_146105_1_));
@@ -1037,6 +1395,114 @@
@@ -1037,6 +1363,114 @@
return this.field_143005_bX;
}