Merge branch 'master' of https://github.com/LTCatt/LTW3

data/mini/functions/trade/game/villager_tp.mcfunction

@@ -1,6 +1,7 @@
 tag @s add tempPlayerTp
 execute as @e[type=villager,tag=TradePlayer] if score @s player_id = @a[tag=tempPlayerTp,limit=1] player_id run tag @s add tempVillagerTp
 execute as @e[type=villager,tag=TradePlayer] if score @s player_id = @a[tag=tempPlayerTp,limit=1] player_id run tag @s add tpPlayer
-execute at @s anchored feet run tp @e[type=villager,tag=tempVillagerTp] ^ ^ ^0.5
+# execute at @s anchored feet run tp @e[type=villager,tag=tempVillagerTp] ^ ^ ^0.5
+data modify entity @e[type=villager,tag=tempVillagerTp,limit=1] Pos set from entity @s Pos
 tag @e[type=villager,tag=tempVillagerTp] remove tempVillagerTp
 tag @s remove tempPlayerTp

data/mini/functions/trade/game_init.mcfunction

@@ -35,7 +35,7 @@ gamerule doEntityDrops true
 gamerule doMobLoot true
 
 # 生成实体
-summon villager 1000 5 5000 {Tags:["TradeMarker","TradeOrigin"],Invulnerable:1b,Silent:1b,Offers:{Recipes:[{buy:{id:"emerald",Count:4},maxUses:999999,rewardExp:false,xp:20,sell:{id:"spider_spawn_egg",Count:1b}}]},VillagerData:{level:5,type:"jungle",profession:"nitwit"},Xp:10}
+summon villager 1000 5 5000 {NoAI:1b,Tags:["TradeMarker","TradeOrigin"],Invulnerable:1b,Silent:1b,Offers:{Recipes:[{buy:{id:"emerald",Count:4},maxUses:999999,rewardExp:false,xp:20,sell:{id:"spider_spawn_egg",Count:1b}}]},VillagerData:{level:5,type:"jungle",profession:"nitwit"},Xp:10}
 # 设置交易列表
 execute as @a[team=playing] run function mini:trade/villager_init
 # 复制交易列表

data/mini/functions/trade/villager_init.mcfunction

@@ -1,5 +1,5 @@
 # 每个玩家生成村民
-summon villager 1000 5 5000 {Tags:["TradeMarker","TradePlayer","newVillager"],Invulnerable:1b,Silent:1b,Offers:{Recipes:[]},VillagerData:{level:2,type:"jungle",profession:"nitwit"},Xp:10}
+summon villager 1000 5 5000 {NoAI:1b,Tags:["TradeMarker","TradePlayer","newVillager"],Invulnerable:1b,Silent:1b,Offers:{Recipes:[]},VillagerData:{level:2,type:"jungle",profession:"nitwit"},Xp:10}
 # 设置对应的积分
 scoreboard players operation @e[type=villager,tag=newVillager] player_id = @s player_id
 tag @e[type=villager,tag=newVillager] remove newVillager